Skip to content

Commit 554d5c9

Browse files
aethelwulffeTony McCormick
aethelwulffe
authored and
Tony McCormick
committed
Turn NationNotes into a module (LibreHealthIO#465)
* Turn NationNotes into a module * Add Global settings for modules
1 parent a59ccb9 commit 554d5c9

File tree

714 files changed

+9526
-112469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

714 files changed

+9526
-112469
lines changed

‎acl_setup.php

-8
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959
// xl('Sensitivities')
6060
$gacl->add_object_section('Placeholder' , 'placeholder' , 10, 0, 'ACO');
6161
// xl('Placeholder')
62-
$gacl->add_object_section('Nation Notes' , 'nationnotes' , 10, 0, 'ACO');
63-
// xl('Nation Notes')
6462
$gacl->add_object_section('Patient Portal','patientportal' , 10, 0, 'ACO');
6563
// xl('Patient Portal')
6664
$gacl->add_object_section('Menus','menus' , 10, 0, 'ACO');
@@ -174,10 +172,6 @@
174172
$gacl->add_object('placeholder', 'Placeholder (Maintains empty ACLs)', 'filler', 10, 0, 'ACO');
175173
// xl('Placeholder (Maintains empty ACLs)')
176174

177-
// Create ACO for nationnotes.
178-
//
179-
$gacl->add_object('nationnotes', 'Nation Notes Configure', 'nn_configure', 10, 0, 'ACO');
180-
// xl('Nation Notes Configure')
181175

182176
// Create ARO groups.
183177
//
@@ -229,7 +223,6 @@
229223
'lists'=>array('default','state','country','language','ethrace'),
230224
'patients'=>array('appt', 'demo', 'med', 'trans', 'docs', 'notes'),
231225
'sensitivities'=>array('normal', 'high'),
232-
'nationnotes'=>array('nn_configure'),
233226
'patientportal'=>array('portal'),
234227
'menus'=>array('modle')
235228
),
@@ -400,7 +393,6 @@
400393
'lists'=>array('default','state','country','language','ethrace'),
401394
'patients'=>array('appt', 'demo', 'med', 'trans', 'docs', 'notes'),
402395
'sensitivities'=>array('normal', 'high'),
403-
'nationnotes'=>array('nn_configure'),
404396
'patientportal'=>array('portal'),
405397
'menus'=>array('modle')
406398
),

‎acl_upgrade.php

-10
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
* ADD sign Sign Lab Results (Physicians)
7373
* ACL/Group breakglass write "Emergency Login" (added all aco's to it)
7474
* 4.1.0
75-
* Section "nationnotes" (Nation Notes)
76-
* ADD nn_configure Nation Notes Configure (Administrators, Emergency Login)
7775
* Section "patientportal" (Patient Portal)
7876
* ADD portal Patient Portal (Administrators, Emergency Login)
7977
* 4.1.1
@@ -156,8 +154,6 @@
156154
addObjectSectionAcl('lists', 'Lists');
157155
//Add 'Placeholder' object section (added in 3.0.2)
158156
addObjectSectionAcl('placeholder', 'Placeholder');
159-
//Add 'Nation Notes' object section (added in 4.1.0)
160-
addObjectSectionAcl('nationnotes','Nation Notes');
161157
//Add 'Patient Portal' object section (added in 4.1.0)
162158
addObjectSectionAcl('patientportal', 'Patient Portal');
163159

@@ -187,8 +183,6 @@
187183
addObjectAcl('placeholder', 'Placeholder', 'filler', 'Placeholder (Maintains empty ACLs)');
188184
//Add 'Sign Lab Results (write,addonly optional)' object (added in 3.3.0)
189185
addObjectAcl('patients', 'Patients', 'sign', 'Sign Lab Results (write,addonly optional)');
190-
//Add 'nationnotes' object (added in 4.1.0)
191-
addObjectAcl('nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure');
192186
//Add 'patientportal' object (added in 4.1.0)
193187
addObjectAcl('patientportal', 'Patient Portal', 'portal', 'Patient Portal');
194188

@@ -316,10 +310,6 @@
316310
updateAcl($emergency_write, 'Emergency Login', 'sensitivities', 'Sensitivities', 'normal', 'Normal', 'write');
317311
//Insert the 'sign' object from the 'patients' section into the Physicians group write ACL (added in 3.3.0)
318312
updateAcl($doc_write, 'Physicians', 'patients', 'Patients', 'sign', 'Sign Lab Results (write,addonly optional)', 'write');
319-
//Insert the 'sign' object from the 'nationnotes' section into the Administrators group write ACL (added in 3.3.0)
320-
updateAcl($admin_write, 'Administrators','nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure','write');
321-
//Insert the 'sign' object from the 'nationnotes' section into the Emergency Login group write ACL (added in 3.3.0)
322-
updateAcl($emergency_write, 'Emergency Login','nationnotes', 'Nation Notes', 'nn_configure', 'Nation Notes Configure','write');
323313
//Insert the 'patientportal' object from the 'patientportal' section into the Administrators group write ACL (added in 4.1.0)
324314
updateAcl($admin_write, 'Administrators','patientportal', 'Patient Portal', 'portal', 'Patient Portal','write');
325315
//Insert the 'patientportal' object from the 'patientportal' section into the Emergency Login group write ACL (added in 4.1.0)

‎interface/forms/LBF/new.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
2-
/*
2+
3+
/**
34
*
45
* Copyright (C) 2016-2017 Terry Hill <[email protected]>
6+
*
57
* Copyright (C) 2009-2014 Rod Roark <[email protected]>
68
*
79
* LICENSE: This program is free software; you can redistribute it and/or
@@ -23,7 +25,10 @@
2325
* @author Rod Roark <[email protected]>
2426
* @link http://librehealth.io
2527
*/
26-
28+
if ($GLOBALS['mod_nn'] == true){
29+
require_once(dirname(dirname(__FILE__)) . "/modules/nation_notes/nn_lbf_new.inc");}
30+
else{
31+
2732
//SANITIZE ALL ESCAPES
2833
$sanitize_all_escapes=true;
2934

@@ -235,21 +240,16 @@ function end_group() {
235240
</style>
236241

237242
<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
238-
239-
<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.css" media="screen" />
240243
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dialog.js"></script>
241-
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery.1.3.2.js"></script>
242-
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js"></script>
243-
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.js"></script>
244-
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-ui.js"></script>
245-
<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery.easydrag.handler.beta2.js"></script>
246244
<script type="text/javascript" src="../../../library/textformat.js"></script>
247245
<script type="text/javascript" src="../../../library/dynarch_calendar.js"></script>
248246
<?php include_once("{$GLOBALS['srcdir']}/dynarch_calendar_en.inc.php"); ?>
249247
<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
248+
<script type="text/javascript" src="../../../library/js/jquery.js"></script>
250249
<?php include_once("{$GLOBALS['srcdir']}/options.js.php"); ?>
251250

252251
<script language="JavaScript">
252+
253253
$(document).ready(function() {
254254
// fancy box
255255
if (window.enable_modals) {
@@ -285,6 +285,7 @@ function end_group() {
285285
});
286286
});
287287

288+
288289
var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
289290

290291
// Supports customizable forms.
@@ -489,7 +490,6 @@ function validate(f) {
489490
echo " /><b>" . text(xl_layout_label($group_name)) . "</b></span>\n";
490491
echo "<div id='div_" . attr($group_seq) . "' class='section' style='display:" . attr($display_style) . ";'>\n";
491492
}
492-
// echo " <table border='0' cellpadding='0' width='100%'>\n";
493493
echo " <table border='0' cellspacing='0' cellpadding='0' width='100%'>\n";
494494
$display_style = 'none';
495495

@@ -650,3 +650,4 @@ function validate(f) {
650650

651651
</body>
652652
</html>
653+
<?php}?>

‎interface/globals.php

+10-4
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ function undoMagicQuotes($array, $topLevel=true) {
151151
// Collecting the utf8 disable flag from the sqlconf.php file in order
152152
// to set the correct html encoding. utf8 vs iso-8859-1. If flag is set
153153
// then set to iso-8859-1.
154+
//THIS NEEDS TO BE IMPROVED!!!
154155
require_once(dirname(__FILE__) . "/../library/sqlconf.php");
155156
if (!$disable_utf8_flag) {
156157
ini_set('default_charset', 'utf-8');
@@ -179,6 +180,15 @@ function undoMagicQuotes($array, $topLevel=true) {
179180
$GLOBALS['standard_js_path'] = "$web_root/assets/js";
180181
$GLOBALS['current_version_js_path'] = "$web_root/assets/js/current_version";
181182

183+
//module configurations
184+
$GLOBALS['modules_dir'] = "$webserver_root/modules/"; //CURRENT modules directory.
185+
$modules_dir = $GLOBALS['modules_dir']; //Make path available as a variable.
186+
$GLOBALS['baseModDir'] = "interface/modules/"; //base directory for the ZEND mods. Not currently used.
187+
$GLOBALS['customModDir']= "custom_modules"; //OLD non zend modules, not used.
188+
$GLOBALS['zendModDir'] = "zend_modules"; //zend module sub-directory, not used.
189+
$GLOBALS['nn_mod'] = 0; //Nation Notes Module value off by default.
190+
//module config TODO: module and global registry for same.
191+
182192
// images directory
183193
$GLOBALS['images_path'] = "$web_root/assets/images";
184194

@@ -438,10 +448,6 @@ function undoMagicQuotes($array, $topLevel=true) {
438448
$SMTP_Auth = !empty($GLOBALS['SMTP_USER']);
439449

440450

441-
//module configurations
442-
$GLOBALS['baseModDir'] = "interface/modules/"; //default path of modules
443-
$GLOBALS['customModDir']= "custom_modules"; //non zend modules
444-
$GLOBALS['zendModDir'] = "zend_modules"; //zend modules
445451

446452
// Don't change anything below this line. ////////////////////////////
447453

‎interface/super/edit_layout.php

+19-83
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Copyright (C) 2014-2015 Rod Roark <[email protected]>
45
*
@@ -19,6 +20,9 @@
1920
*/
2021

2122
require_once("../globals.php");
23+
if ($GLOBALS['mod_nn'] == true){
24+
require_once(dirname(dirname(__FILE__)) . "/modules/nation_notes/nn_super_edit_layout.inc");}
25+
else{
2226
require_once("$srcdir/acl.inc");
2327
require_once("$srcdir/log.inc");
2428
require_once("$srcdir/formdata.inc.php");
@@ -72,7 +76,6 @@
7276
"31" => xl("Static Text"),
7377
"32" => xl("Smoking Status"),
7478
"33" => xl("Race and Ethnicity"),
75-
"34" => xl("NationNotes"),
7679
"35" => xl("Facilities"),
7780
"36" => xl("Multiple Select List")
7881
);
@@ -145,7 +148,6 @@ function addOrDeleteColumn($layout_id, $field_id, $add=TRUE) {
145148
$iter = $fld[$lino];
146149
$field_id = formTrim($iter['id']);
147150
$data_type = formTrim($iter['data_type']);
148-
$listval = $data_type == 34 ? formTrim($iter['contextName']) : formTrim($iter['list_id']);
149151

150152
// Skip conditions for the line are stored as a serialized array.
151153
$condarr = array();
@@ -174,7 +176,7 @@ function addOrDeleteColumn($layout_id, $field_id, $add=TRUE) {
174176
"titlecols = '" . formTrim($iter['titlecols']) . "', " .
175177
"datacols = '" . formTrim($iter['datacols']) . "', " .
176178
"data_type= '$data_type', " .
177-
"list_id= '" . $listval . "', " .
179+
"list_id= '" . formTrim($iter['list_id']) . "', " .
178180
"list_backup_id= '" . formTrim($iter['list_backup_id']) . "', " .
179181
"edit_options = '" . formTrim($iter['edit_options']) . "', " .
180182
"default_value = '" . formTrim($iter['default']) . "', " .
@@ -211,7 +213,7 @@ function addOrDeleteColumn($layout_id, $field_id, $add=TRUE) {
211213
",'" . formTrim($_POST['newdefault'] ) . "'" .
212214
",'" . formTrim($_POST['newdesc'] ) . "'" .
213215
",'" . formTrim($_POST['newmaxSize']) . "'" .
214-
",'" . $listval . "'" .
216+
",'" . formTrim($_POST['newlistid'] ) . "'" .
215217
",'" . formTrim($_POST['newbackuplistid']) . "'" .
216218
" )");
217219
addOrDeleteColumn($layout_id, formTrim($_POST['newid']), TRUE);
@@ -267,7 +269,7 @@ function addOrDeleteColumn($layout_id, $field_id, $add=TRUE) {
267269

268270
$data_type = formTrim($_POST['gnewdatatype']);
269271
$max_length = $data_type == 3 ? 3 : 255;
270-
$listval = $data_type == 34 ? formTrim($_POST['gcontextName']) : formTrim($_POST['gnewlistid']);
272+
271273
// add a new group to the layout, with the defined field
272274
sqlStatement("INSERT INTO layout_options (" .
273275
" form_id, source, field_id, title, group_name, seq, uor, fld_length, fld_rows" .
@@ -290,7 +292,7 @@ function addOrDeleteColumn($layout_id, $field_id, $add=TRUE) {
290292
",'" . formTrim($_POST['gnewdefault'] ) . "'" .
291293
",'" . formTrim($_POST['gnewdesc'] ) . "'" .
292294
",'" . formTrim($_POST['gnewmaxSize']) . "'" .
293-
",'" . $listval . "'" .
295+
",'" . formTrim($_POST['gnewlistid'] ) . "'" .
294296
",'" . formTrim($_POST['gnewbackuplistid'] ) . "'" .
295297
" )");
296298
addOrDeleteColumn($layout_id, formTrim($_POST['gnewid']), TRUE);
@@ -431,12 +433,7 @@ function writeFieldLine($linedata) {
431433
echo "<input type='text' name='fld[$fld_line_no][id]' value='" .
432434
htmlspecialchars($linedata['field_id'], ENT_QUOTES) . "' size='15' maxlength='63'
433435
class='optin noselect' style='width:100%' />";
434-
// class='optin noselect' onclick='FieldIDClicked(this)' />";
435-
/*
436-
echo "<input type='hidden' name='fld[$fld_line_no][id]' value='" .
437-
htmlspecialchars($linedata['field_id'], ENT_QUOTES) . "' />";
438-
echo htmlspecialchars($linedata['field_id'], ENT_QUOTES);
439-
*/
436+
440437
echo "</td>\n";
441438

442439
echo " <td align='center' class='optcell' style='width:12%'>";
@@ -460,7 +457,7 @@ class='optin noselect' style='width:100%' />";
460457
echo "</td>\n";
461458

462459
echo " <td align='center' class='optcell' style='width:8%'>";
463-
echo "<select name='fld[$fld_line_no][data_type]' id='fld[$fld_line_no][data_type]' onchange=NationNotesContext('".$fld_line_no."',this.value)>";
460+
echo "<select name='fld[$fld_line_no][data_type]' id='fld[$fld_line_no][data_type]'>";
464461
echo "<option value=''></option>";
465462
GLOBAL $datatypes;
466463
foreach ($datatypes as $key=>$value) {
@@ -513,29 +510,15 @@ class='optin noselect' style='width:100%' />";
513510
$linedata['data_type'] == 22 || $linedata['data_type'] == 23 ||
514511
$linedata['data_type'] == 25 || $linedata['data_type'] == 26 ||
515512
$linedata['data_type'] == 27 || $linedata['data_type'] == 32 ||
516-
$linedata['data_type'] == 33 || $linedata['data_type'] == 34 ||
513+
$linedata['data_type'] == 33 ||
517514
$linedata['data_type'] == 36)
518515
{
519-
$type = "";
520-
$disp = "style='display:none'";
521-
if($linedata['data_type'] == 34){
522-
$type = "style='display:none'";
523-
$disp = "";
524-
}
525-
echo "<input type='text' name='fld[$fld_line_no][list_id]' id='fld[$fld_line_no][list_id]' value='" .
526-
htmlspecialchars($linedata['list_id'], ENT_QUOTES) . "'".$type.
527-
" size='6' maxlength='30' class='optin listid' style='width:100%;cursor:pointer'".
516+
echo "<input type='text' name='fld[$fld_line_no][list_id]' value='" .
517+
htmlspecialchars($linedata['list_id'], ENT_QUOTES) . "'".
518+
"size='6' maxlength='30' class='optin listid' style='cursor: pointer'".
528519
"title='". xl('Choose list') . "' />";
529520

530-
echo "<select name='fld[$fld_line_no][contextName]' id='fld[$fld_line_no][contextName]' ".$disp.">";
531-
$res = sqlStatement("SELECT * FROM customlists WHERE cl_list_type=2 AND cl_deleted=0");
532-
while($row = sqlFetchArray($res)){
533-
$sel = '';
534-
if ($linedata['list_id'] == $row['cl_list_item_long'])
535-
$sel = 'selected';
536-
echo "<option value='".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."' ".$sel.">".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."</option>";
537-
}
538-
echo "</select>";
521+
539522
}
540523
else {
541524
// all other data_types
@@ -1122,14 +1105,6 @@ function cidChanged(lino, seq) {
11221105
<input type="textbox" name="gnewlengthHeight" id="gnewlengthHeight" value="" size="1" maxlength="3" title="<?php echo xla('Height'); ?>"></td>
11231106
<td><input type="textbox" name="gnewmaxSize" id="gnewmaxSize" value="" size="1" maxlength="3" title="<?php echo xla('Maximum Size (entering 0 will allow any size)'); ?>"></td>
11241107
<td><input type="textbox" name="gnewlistid" id="gnewlistid" value="" size="8" maxlength="31" class="listid">
1125-
<select name='gcontextName' id='gcontextName' style='display:none'>
1126-
<?php
1127-
$res = sqlStatement("SELECT * FROM customlists WHERE cl_list_type=2 AND cl_deleted=0");
1128-
while($row = sqlFetchArray($res)){
1129-
echo "<option value='".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."'>".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."</option>";
1130-
}
1131-
?>
1132-
</select>
11331108
</td>
11341109
<td><input type="textbox" name="gnewbackuplistid" id="gnewbackuplistid" value="" size="8" maxlength="31" class="listid"></td>
11351110
<td><input type="textbox" name="gnewtitlecols" id="gnewtitlecols" value="" size="3" maxlength="3"> </td>
@@ -1205,14 +1180,6 @@ function cidChanged(lino, seq) {
12051180
<input type="textbox" name="newlengthHeight" id="newlengthHeight" value="" size="1" maxlength="3" title="<?php echo xla('Height'); ?>"></td>
12061181
<td><input type="textbox" name="newmaxSize" id="newmaxSize" value="" size="1" maxlength="3" title="<?php echo xla('Maximum Size (entering 0 will allow any size)'); ?>"></td>
12071182
<td><input type="textbox" name="newlistid" id="newlistid" value="" size="8" maxlength="31" class="listid">
1208-
<select name='contextName' id='contextName' style='display:none'>
1209-
<?php
1210-
$res = sqlStatement("SELECT * FROM customlists WHERE cl_list_type=2 AND cl_deleted=0");
1211-
while($row = sqlFetchArray($res)){
1212-
echo "<option value='".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."'>".htmlspecialchars($row['cl_list_item_long'],ENT_QUOTES)."</option>";
1213-
}
1214-
?>
1215-
</select>
12161183
</td>
12171184
<td><input type="textbox" name="newbackuplistid" id="newbackuplistid" value="" size="8" maxlength="31" class="listid"></td>
12181185
<td><input type="textbox" name="newtitlecols" id="newtitlecols" value="" size="3" maxlength="3"> </td>
@@ -1294,8 +1261,6 @@ function getNextSeq(group) {
12941261
$(".savenewfield").click(function() { SaveNewField(this); });
12951262
$(".cancelnewfield").click(function() { CancelNewField(this); });
12961263
$("#newtitle").blur(function() { if ($("#newid").val() == "") $("#newid").val($("#newtitle").val()); });
1297-
$("#newdatatype").change(function() { ChangeList(this.value);});
1298-
$("#gnewdatatype").change(function() { ChangeListg(this.value);});
12991264
$(".listid").click(function() { ShowLists(this); });
13001265

13011266
// special class that skips the element
@@ -1555,27 +1520,7 @@ function getNextSeq(group) {
15551520
window.open("./show_groups_popup.php?layout_id=<?php echo $layout_id;?>", "groups", "width=300,height=300,scrollbars=yes");
15561521
};
15571522

1558-
// Show context DD for NationNotes
1559-
var ChangeList = function(btnObj){
1560-
if(btnObj==34){
1561-
$('#newlistid').hide();
1562-
$('#contextName').show();
1563-
}
1564-
else{
1565-
$('#newlistid').show();
1566-
$('#contextName').hide();
1567-
}
1568-
};
1569-
var ChangeListg = function(btnObj){
1570-
if(btnObj==34){
1571-
$('#gnewlistid').hide();
1572-
$('#gcontextName').show();
1573-
}
1574-
else{
1575-
$('#gnewlistid').show();
1576-
$('#gcontextName').hide();
1577-
}
1578-
};
1523+
15791524

15801525
// Initialize the list item selectors in skip conditions.
15811526
var f = document.forms[0];
@@ -1587,18 +1532,6 @@ function getNextSeq(group) {
15871532

15881533
});
15891534

1590-
function NationNotesContext(lineitem,val){
1591-
if(val==34){
1592-
document.getElementById("fld["+lineitem+"][contextName]").style.display='';
1593-
document.getElementById("fld["+lineitem+"][list_id]").style.display='none';
1594-
document.getElementById("fld["+lineitem+"][list_id]").value='';
1595-
}
1596-
else{
1597-
document.getElementById("fld["+lineitem+"][list_id]").style.display='';
1598-
document.getElementById("fld["+lineitem+"][contextName]").style.display='none';
1599-
document.getElementById("fld["+lineitem+"][list_id]").value='';
1600-
}
1601-
}
16021535

16031536
function SetList(listid) {
16041537
$(selectedfield).val(listid);
@@ -1716,3 +1649,6 @@ function IsN(num) { return !/\D/.test(num); }
17161649
</script>
17171650

17181651
</html>
1652+
<?php
1653+
}
1654+
?>

0 commit comments

Comments
 (0)