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

Removed old metric vitals form #1645

Closed
wants to merge 1 commit into from
Closed

Removed old metric vitals form #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions interface/forms_admin/forms_admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
<?php
// 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
Expand Down Expand Up @@ -52,7 +52,7 @@
$priority_id = $matches[1];
sqlQuery("update registry set priority=? where id=?", array($val, $priority_id));
}
}
}
?>


Expand All @@ -76,7 +76,7 @@
<div class="panel-heading"><?php xl('Registered','e');?></div>
<div class="panel-body">
<i><?php xl('click here to update priority, category and nickname settings','e'); ?></i>&nbsp
<input type=submit name=update class='cp-positive btn' value='<?php xl('Update','e'); ?>'><br>
<input type=submit name=update class='cp-positive btn' value='<?php xl('Update','e'); ?>'><br>
</div>
<table class="table table-bordered" cellpadding=1 cellspacing=2>
<tr>
Expand All @@ -94,14 +94,14 @@
if ($bigdata != false)
foreach($bigdata as $registry)
{
$priority_category = sqlQuery("select priority, category, nickname from registry where id=?", array($registry['id']));
$priority_category = sqlQuery("select priority, category, nickname from registry where id=?", array($registry['id']));
?>
<tr td bgcolor="<?php echo $color?>">
<td width="2%">
<span class=text><?php echo $registry['id'];?></span>
<span class=text><?php echo $registry['id'];?></span>
</td>
<td width="30%">
<span class=bold><?php echo xl_form_title($registry['name']); ?></span>
<span class=bold><?php echo xl_form_title($registry['name']); ?></span>
</td>
<?php
if ($registry['sql_run'] == 0)
Expand All @@ -113,21 +113,21 @@
?></td>
<td width="10%">
<span class=text><?php

if ($registry['unpackaged'])
echo xl('PHP extracted','e');
else
echo xl('PHP compressed','e');
?></span>

?></span>
</td>
<td width="10%">
<?php
if ($registry['sql_run'])
echo "<span class=text>".xl('DB installed')."</span>";
else
echo "<a class=link_submit href='./forms_admin.php?id={$registry['id']}&method=install_db'>".xl('install DB')."</a>";
?>
?>
</td>
<?php
echo "<td><input class='form-control' type=text size=4 name=priority_".$registry['id']." value='".$priority_category['priority']."'></td>";
Expand Down Expand Up @@ -181,8 +181,8 @@
{
// added 8-2009 by BM - do not show the metric vitals form as option since deprecated
// also added a toggle in globals.php in case user wants the option to add this deprecated form
if (($fname == "vitalsM") && ($GLOBALS['disable_deprecated_metrics_form'])) continue;
if (($fname == "vitalsM")) continue;

if (stristr($fname, ".tar.gz") || stristr($fname, ".tar") || stristr($fname, ".zip") || stristr($fname, ".gz"))
$phpState = "PHP compressed";
else
Expand All @@ -197,7 +197,7 @@
else
$form_title = $fname;
?>
<span class=bold><?php echo xl_form_title($form_title); ?></span>
<span class=bold><?php echo xl_form_title($form_title); ?></span>
</td>
<td width="10%"><?php
if ($phpState == "PHP extracted")
Expand All @@ -206,10 +206,10 @@
echo '<span class=text>' . xl('n/a') . '</span>';
?></td>
<td width="20%">
<span class=text><?php echo xl($phpState); ?></span>
<span class=text><?php echo xl($phpState); ?></span>
</td>
<td width="10%">
<span class=text><?php xl('n/a','e'); ?></span>
<span class=text><?php xl('n/a','e'); ?></span>
</td>
</tr>
<?php
Expand Down
15 changes: 1 addition & 14 deletions library/globals.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,19 +433,6 @@
xl('Applies to Vitals form')
)
,
'disable_deprecated_metrics_form' => array(
xl('Disable Old Metric Vitals Form'),
'bool', // data type
'1', // default = true
xl('This was the older metric-only Vitals form, now deprecated.')
),

'phone_country_code' => array(
xl('Telephone Country Code'),
'num',
'1', // default = North America
xl('1 = North America. See http://www.wtng.info/ for a list of other country codes.')
),

'date_display_format' => array(
xl('Date Display Format'),
Expand Down Expand Up @@ -3278,7 +3265,7 @@
),
),

'LIMS' => array(
'LIMS' => array(
'lims_enabled' => array(
xl('LIMS Enabled/Disabled'),
'bool',
Expand Down