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.

Sign up for GitHub

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

Jump to bottom

General cleanup, minor bug fixes and UI improvements in Administration #666

Merged
merged 2 commits into from Aug 21, 2017
Merged

General cleanup, minor bug fixes and UI improvements in Administration #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2bdbe0
minor ui-changes in adminsitartion and cleanup
nileshprasad137 Aug 15, 2017
fc5e7c0
resolves layout issues in frames,smaller form-control
nileshprasad137 Aug 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion interface/forms/fee_sheet/new.php
View file
Open in desktop
Expand Up @@ -1070,7 +1070,7 @@ function newEvt() {
<?php echo xlt('for'); ?>&nbsp;
</td>
<td>
<input type='text' class="form-control" name='search_term' value=''> &nbsp;
<input type='text' class="form-control input-sm" name='search_term' value=''> &nbsp;
</td>
<td>
<input type='submit' name='bn_search' value='<?php echo xla('Search');?>'>
Expand Down
14 changes: 7 additions & 7 deletions interface/forms/patient_encounter/common.php
View file
Open in desktop
Expand Up @@ -167,7 +167,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
<div class="row">
<div class="col-xs-12 col-sm-4 col-lg-4 ">
<?php echo xlt('Consultation Brief Description'); ?>:
<textarea class="form-control" name='reason' cols='40' rows='12' wrap='virtual'>
<textarea class="form-control input-sm" name='reason' cols='40' rows='12' wrap='virtual'>
<?php echo $viewmode ? text($result['reason']) : text($GLOBALS['default_chief_complaint']); ?>
</textarea>
<hr>
Expand All @@ -178,7 +178,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
<tr>
<td class='bold'><?php echo xlt('Visit Category:'); ?></td>
<td class='text'>
<select class="form-control" name='pc_catid' id='pc_catid'>
<select class="form-control input-sm" name='pc_catid' id='pc_catid'>
<option value='_blank'>-- <?php echo xlt('Select One'); ?> --</option>
<?php
$cres = sqlStatement("SELECT pc_catid, pc_catname " .
Expand All @@ -198,7 +198,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
<tr>
<td class='bold'><?php echo xlt('Place of Service:'); ?></td>
<td class='text'>
<select class="form-control" name='facility_id' onChange="bill_loc()">
<select class="form-control input-sm" name='facility_id' onChange="bill_loc()">
<?php

if ($viewmode) {
Expand Down Expand Up @@ -241,7 +241,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
?>
<td class='bold'><?php echo xlt('Sensitivity:'); ?></td>
<td class='text'>
<select class="form-control" name='form_sensitivity'>
<select class="form-control input-sm" name='form_sensitivity'>
<?php
foreach ($sensitivities as $value) {
// Omit sensitivities to which this user does not have access.
Expand Down Expand Up @@ -278,7 +278,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
<tr>
<td class='bold' ><?php echo xlt('Date of Service:'); ?></td>
<td class='text' >
<input type='text' class="form-control" size='10' name='form_date' id='form_date' <?php echo $disabled ?>
<input type='text' class="form-control input-sm" size='10' name='form_date' id='form_date' <?php echo $disabled ?>
value='<?php echo $viewmode ? oeFormatShortDate(substr($result['date'], 0, 10)) : date($DateFormat); ?>'
title='<?php echo xla('Date of Service'); ?>'/>
</td>
Expand All @@ -287,7 +287,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
<tr<?php if ($GLOBALS['ippf_specific']) echo " style='visibility:hidden;'"; ?>>
<td class='bold' ><?php echo xlt('Onset/hosp. date:'); ?></td>
<td class='text' ><!-- default is blank so that while generating claim the date is blank. -->
<input type='text' class="form-control" size='10' name='form_onset_date' id='form_onset_date'
<input type='text' class="form-control input-sm" size='10' name='form_onset_date' id='form_onset_date'
value='<?php echo $viewmode && $result['onset_date']!='0000-00-00 00:00:00' ? oeFormatShortDate(substr($result['onset_date'], 0, 10)) : ''; ?>'
title='<?php echo xla('Date of onset or hospitalization'); ?>'/>
</td>
Expand All @@ -311,7 +311,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
onclick="top.restoreSession()"><span><?php echo xlt('Add'); ?></span></a>
</div>

<select multiple class="form-control" name='issues[]' size='8'
<select multiple class="form-control input-sm" name='issues[]' size='8'
title='<?php echo xla('Hold down [Ctrl] for multiple selections or to unselect'); ?>'>
<?php
while ($irow = sqlFetchArray($ires)) {
Expand Down
88 changes: 47 additions & 41 deletions interface/patient_file/encounter/superbill_custom_full.php
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@
require_once("$srcdir/options.inc.php");
require_once("$srcdir/formatting.inc.php");
require_once("$srcdir/formdata.inc.php");
require_once("$srcdir/headers.inc.php");

// Translation for form fields.
function ffescape($field) {
Expand Down Expand Up @@ -233,12 +234,14 @@ function bucks($amount) {

<html>
<head>
<style>

</style>
<title><?php echo xlt("Codes"); ?></title>
<?php html_header_show(); ?>
<link rel="stylesheet" href="<?php echo attr($css_header);?>" type="text/css">
<script type="text/javascript" src="../../../library/dialog.js"></script>
<script type="text/javascript" src="../../../library/textformat.js"></script>

<?php
html_header_show();
call_required_libraries(true,false,false,false);
?>
<script language="JavaScript">

// This is for callback by the find-code popup.
Expand Down Expand Up @@ -377,11 +380,8 @@ function getCTMask() {
<br>

<center>
<table border='0' cellpadding='0' cellspacing='0'>

<tr>
<td colspan="3"> <?php echo xlt('Not all fields are required for all codes or code types.'); ?><br><br></td>
</tr>
<?php echo xlt('Not all fields are required for all codes or code types.'); ?>
<table class="table">

<tr>
<td><?php echo xlt('Type'); ?>:</td>
Expand All @@ -390,7 +390,7 @@ function getCTMask() {
<td>

<?php if ($mode != "modify") { ?>
<select name="code_type">
<select name="code_type" class="form-control input-sm">
<?php } ?>

<?php $external_sets = array(); ?>
Expand All @@ -410,34 +410,35 @@ function getCTMask() {
<?php } ?>

<?php if ($mode == "modify") { ?>
<input type='text' size='4' name='code_type' readonly='readonly' style='display:none' value='<?php echo attr($code_type) ?>' />
<input type='text' class="form-control input-sm" name='code_type' readonly='readonly' style='display:none' value='<?php echo attr($code_type) ?>' />
<?php echo attr($code_type_name_external) ?>
<?php } ?>

&nbsp;&nbsp;
<?php echo xlt('Code'); ?>:

</td>
<td>
<?php echo xlt('Code'); ?>:
<?php if ($mode == "modify") { ?>
<input type='text' size='6' name='code' readonly='readonly' value='<?php echo attr($code) ?>' />
<input type='text' name='code' class="form-control input-sm" readonly='readonly' value='<?php echo attr($code) ?>' />
<?php } else { ?>
<input type='text' size='6' name='code' value='<?php echo attr($code) ?>'
<input type='text' size='6' name='code' class="form-control input-sm" value='<?php echo attr($code) ?>'
onkeyup='maskkeyup(this,getCTMask())'
onblur='maskblur(this,getCTMask())'
/>
<?php } ?>
</td>

<?php if (modifiers_are_used()) { ?>
&nbsp;&nbsp;<?php echo xlt('Modifier'); ?>:
<td>
<?php echo xlt('Modifier'); ?>:
<?php if ($mode == "modify") { ?>
<input type='text' size='3' name='modifier' readonly='readonly' value='<?php echo attr($modifier) ?>'>
<input type='text' class="form-control input-sm" size='3' name='modifier' readonly='readonly' value='<?php echo attr($modifier) ?>'>
<?php } else { ?>
<input type='text' size='3' name='modifier' value='<?php echo attr($modifier) ?>'>
<input type='text' class="form-control input-sm" size='3' name='modifier' value='<?php echo attr($modifier) ?>'>
<?php } ?>
<?php } else { ?>
<input type='hidden' name='modifier' value=''>
<?php } ?>

&nbsp;&nbsp;
</td>
<td>
<input type='checkbox' name='active' value='1'<?php if (!empty($active) || ($mode == 'modify' && $active == NULL) ) echo ' checked'; ?> />
<?php echo xlt('Active');
if($GLOBALS['bill_to_patient'] ==1) {?>
Expand All @@ -454,9 +455,9 @@ function getCTMask() {
<td>

<?php if ($mode == "modify") { ?>
<input type='text' size='50' name="code_text" readonly="readonly" value='<?php echo attr($code_text) ?>'>
<input type='text' class="form-control input-sm" size='50' name="code_text" readonly="readonly" value='<?php echo attr($code_text) ?>'>
<?php } else { ?>
<input type='text' size='50' name="code_text" value='<?php echo attr($code_text) ?>'>
<input type='text' class="form-control input-sm" size='50' name="code_text" value='<?php echo attr($code_text) ?>'>
<?php } ?>

</td>
Expand All @@ -469,28 +470,31 @@ function getCTMask() {
<?php
generate_form_field(array('data_type'=>1,'field_id'=>'superbill','list_id'=>'superbill'), $superbill);
?>
&nbsp;&nbsp;
</td>
<td>
<input type='checkbox' title='<?php echo xlt("Syndromic Surveillance Report") ?>' name='reportable' value='1'<?php if (!empty($reportable)) echo ' checked'; ?> />
<?php echo xlt('Diagnosis Reporting'); ?>
&nbsp;&nbsp;&nbsp;&nbsp;
<?php echo xlt('Diagnosis Reporting'); ?>
</td>
<td>
<input type='checkbox' title='<?php echo xlt("Service Code Finance Reporting") ?>' name='financial_reporting' value='1'<?php if (!empty($financial_reporting)) echo ' checked'; ?> />
<?php echo xlt('Service Reporting'); ?>
</td>
</td>
</tr>

<tr<?php if (empty($GLOBALS['ippf_specific'])) echo " style='display:none'"; ?>>
<td><?php echo xlt('CYP Factor'); ?>:</td>
<td></td>
<td>
<input type='text' size='10' maxlength='20' name="cyp_factor" value='<?php echo attr($cyp_factor) ?>'>
<input type='text' class="form-control input-sm" size='10' maxlength='20' name="cyp_factor" value='<?php echo attr($cyp_factor) ?>'>
</td>
</tr>

<tr<?php if (!related_codes_are_used()) echo " style='display:none'"; ?>>
<td><?php echo xlt('Relate To'); ?>:</td>
<td></td>
<td>
<input type='text' size='50' name='related_desc'
<input type='text' class="form-control input-sm" size='50' name='related_desc'
value='<?php echo attr($related_desc) ?>' onclick="sel_related()"
title='<?php echo xla('Click to select related code'); ?>' readonly />
<input type='hidden' name='related_code' value='<?php echo attr($related_code) ?>' />
Expand Down Expand Up @@ -544,22 +548,21 @@ function getCTMask() {
<input type="hidden" name="code_type_name_external" value="<?php echo attr($code_type_name_external) ?>">
<input type="hidden" name="code_external" value="<?php echo attr($code_external) ?>">
<?php if ($mode == "modify") { ?>
<a href='javascript:submitModifyComplete();' class='link'>[<?php echo xlt('Update'); ?>]</a>
<a href='javascript:submitModifyComplete();' class='css_button'><?php echo xlt('Update'); ?></a>
<?php } else { ?>
<a href='javascript:submitUpdate();' class='link'>[<?php echo xlt('Update'); ?>]</a>
<a href='javascript:submitUpdate();' class='btn btn-primary'><?php echo xlt('Update'); ?></a>
&nbsp;&nbsp;
<a href='javascript:submitAdd();' class='link'>[<?php echo xlt('Add as New'); ?>]</a>
<a href='javascript:submitAdd();' class='btn btn-primary'><?php echo xlt('Add as New'); ?></a>
<?php } ?>
</td>
</tr>

</table>
<br>
<table border='0' cellpadding='5' cellspacing='0' width='96%'>
<table class="table">
<tr>

<td class='text'>
<select name='filter[]' multiple='multiple'>
<select class="form-control input-sm" name='filter[]' multiple='multiple'>
<?php
foreach ($code_types as $key => $value) {
echo "<option value='" . attr($value['id']) . "'";
Expand All @@ -568,10 +571,10 @@ function getCTMask() {
}
?>
</select>
&nbsp;&nbsp;&nbsp;&nbsp;


<input type="text" name="search" size="5" value="<?php echo attr($search) ?>">&nbsp;
<input type="submit" name="go" value='<?php echo xla('Search'); ?>'>&nbsp;&nbsp;
<input type="text" class="form-control input-sm" name="search" size="5" value="<?php echo attr($search) ?>"><br>
<input type="submit" class="btn btn-primary" name="go" value='<?php echo xla('Search'); ?>'>&nbsp;&nbsp;
<input type='checkbox' title='<?php echo xlt("Only Show Diagnosis Reporting Codes") ?>' name='search_reportable' value='1'<?php if (!empty($search_reportable)) echo ' checked'; ?> />
<?php echo xlt('Diagnosis Reporting Only'); ?>
&nbsp;&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -599,7 +602,7 @@ function getCTMask() {

</form>

<table border='0' cellpadding='5' cellspacing='0' width='96%'>
<table class="table">
<tr>
<td><span class='bold'><?php echo xlt('Code'); ?></span></td>
<td><span class='bold'><?php echo xlt('Mod'); ?></span></td>
Expand Down Expand Up @@ -710,6 +713,9 @@ function getCTMask() {
}
?>
</script>
<script type="text/javascript">
$("#form_superbill").addClass('form-control input-sm');
</script>

</body>
</html>
</html>
20 changes: 10 additions & 10 deletions interface/super/edit_globals.php
View file
Open in desktop
Expand Up @@ -364,7 +364,7 @@ function checkBackgroundServices(){
echo " <tr $srch_cl title='" . attr($flddesc) . "' id='".attr($fldid)."' value='".attr($fldvalue)."'><td><b>" . text($fldname) . "</b></td><td>\n";

if (is_array($fldtype)) {
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
foreach ($fldtype as $key => $value) {
if ($_GET['mode'] == "user") {
if ($globalValue == $key) $globalTitle = $value;
Expand Down Expand Up @@ -399,15 +399,15 @@ function checkBackgroundServices(){
if ($_GET['mode'] == "user") {
$globalTitle = $globalValue;
}
echo " <input type='text' class='form-control form-rounded' name='form_$i' id='form_$i' " .
echo " <input type='text' class='form-control input-sm' name='form_$i' id='form_$i' " .
"size='6' maxlength='15' value='" . attr($fldvalue) . "' />\n";
}

else if ($fldtype == 'text') {
if ($_GET['mode'] == "user") {
$globalTitle = $globalValue;
}
echo " <input type='text' class='form-control form-rounded' name='form_$i' id='form_$i' " .
echo " <input type='text' class='form-control input-sm' name='form_$i' id='form_$i' " .
"size='50' maxlength='255' value='" . attr($fldvalue) . "' />\n";
}
else if ($fldtype == 'pwd') {
Expand All @@ -428,7 +428,7 @@ function checkBackgroundServices(){

else if ($fldtype == 'lang') {
$res = sqlStatement("SELECT * FROM lang_languages ORDER BY lang_description");
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
while ($row = sqlFetchArray($res)) {
echo " <option value='" . attr($row['lang_description']) . "'";
if ($row['lang_description'] == $fldvalue) echo " selected";
Expand All @@ -449,7 +449,7 @@ function checkBackgroundServices(){
$order = "title, seq";
}
$res = sqlStatement("SELECT option_id, title FROM list_options WHERE list_id = ? AND activity=1 ORDER BY " . $order, array('apptstat'));
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
if ($flddef ==" ") {
$top_choice = "All";
}else{
Expand Down Expand Up @@ -534,7 +534,7 @@ function checkBackgroundServices(){

else if ($fldtype == 'all_code_types') {
global $code_types;
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
foreach (array_keys($code_types) as $code_key ) {
echo " <option value='" . attr($code_key) . "'";
if ($code_key == $fldvalue) echo " selected";
Expand All @@ -547,7 +547,7 @@ function checkBackgroundServices(){

else if ($fldtype == 'm_lang') {
$res = sqlStatement("SELECT * FROM lang_languages ORDER BY lang_description");
echo " <select multiple name='form_{$i}[]' class='form-control' id='form_{$i}[]' size='3'>\n";
echo " <select multiple name='form_{$i}[]' class='form-control input-sm' id='form_{$i}[]' size='3'>\n";
while ($row = sqlFetchArray($res)) {
echo " <option value='" . attr($row['lang_description']) . "'";
foreach ($glarr as $glrow) {
Expand Down Expand Up @@ -578,7 +578,7 @@ function checkBackgroundServices(){
$themedir = "$webserver_root/interface/themes";
$dh = opendir($themedir);
if ($dh) {
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
while (false !== ($tfname = readdir($dh))) {
// Only show files that contain style_ as options
// Skip style_blue.css since this is used for
Expand Down Expand Up @@ -609,7 +609,7 @@ function checkBackgroundServices(){
$themedir = "$webserver_root/interface/themes";
$dh = opendir($themedir);
if ($dh) {
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
while (false !== ($tfname = readdir($dh))) {
// Only show files that contain tabs_style_ as options
if (!preg_match("/^tabs_style_.*\.css$/", $tfname)) continue;
Expand All @@ -632,7 +632,7 @@ function checkBackgroundServices(){
if ($_GET['mode'] == "user") {
$globalTitle = $globalValue;
}
echo " <select class='form-control' name='form_$i' id='form_$i'>\n";
echo " <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
for ($h = 0; $h < 24; ++$h) {
echo "<option value='$h'";
if ($h == $fldvalue) echo " selected";
Expand Down