Removed athletic_team code.

DiscoverAndChange · May 11, 2016 · 3c59355 · 3c59355
1 parent 6566900
commit 3c59355
Show file tree

Hide file tree

Showing 30 changed files with 88 additions and 3,543 deletions.
diff --git a/contrib/forms/xmlformgen/xslt/common_objects.xslt b/contrib/forms/xmlformgen/xslt/common_objects.xslt
@@ -160,14 +160,6 @@ if ( acl_check(']]></xsl:text>
  $thisauth_write_addonly=TRUE;
 }
 ]]></xsl:text>
-<xsl:text disable-output-escaping="yes"><![CDATA[
-/* perform a squad check for pages touching patients, if we're in 'athletic team' mode */
-if ($GLOBALS['athletic_team']!='false') {
- $tmp = getPatientData($pid, 'squad');
- if ($tmp['squad'] && ! acl_check('squads', $tmp['squad']))
- die(text($form_name).': '.xlt("Access Denied"));
-}
-]]></xsl:text>
 <xsl:if test="$page='new' or $page='view'">
 <xsl:text disable-output-escaping="yes"><![CDATA[
 if (!$thisauth_write_addonly)

diff --git a/interface/forms/newpatient/common.php b/interface/forms/newpatient/common.php
@@ -88,15 +88,11 @@ function refreshIssue(issue, title) {
 
  function saveClicked() {
  var f = document.forms[0];
-
-<?php if (!$GLOBALS['athletic_team']) { ?>
  var category = document.forms[0].pc_catid.value;
  if ( category == '_blank' ) {
  alert("<?php echo xls('You must select a visit category'); ?>");
  return;
  }
-<?php } ?>
-
  top.restoreSession();
  f.submit();
  }
@@ -182,7 +178,7 @@ class="css_button link_submit" target='Main' onClick="top.restoreSession()">
  <td width='34%' rowspan='2' align='center' valign='center' class='text'>
  <table>
 
- <tr<?php if ($GLOBALS['athletic_team']) echo " style='visibility:hidden;'"; ?>>
+ <tr>
  <td class='bold' nowrap><?php echo xlt('Visit Category:'); ?></td>
  <td class='text'>
  <select name='pc_catid' id='pc_catid'>
@@ -295,7 +291,7 @@ class="css_button link_submit" target='Main' onClick="top.restoreSession()">
  </td>
  </tr>
 
- <tr<?php if ($GLOBALS['ippf_specific'] || $GLOBALS['athletic_team']) echo " style='visibility:hidden;'"; ?>>
+ <tr<?php if ($GLOBALS['ippf_specific']) echo " style='visibility:hidden;'"; ?>>
  <td class='bold' nowrap><?php echo xlt('Onset/hosp. date:'); ?></td>
  <td class='text' nowrap><!-- default is blank so that while generating claim the date is blank. -->
  <input type='text' size='10' name='form_onset_date' id='form_onset_date'
@@ -307,18 +303,10 @@ class="css_button link_submit" target='Main' onClick="top.restoreSession()">
  title='<?php echo xla('Click here to choose a date'); ?>'>
  </td>
  </tr>
-
- <tr>
+ <tr>
  <td class='text' colspan='2' style='padding-top:1em'>
-<?php if ($GLOBALS['athletic_team']) { ?>
- <p><i>Click [Add Issue] to add a new issue if:<br />
- New injury likely to miss &gt; 1 day<br />
- New significant illness/medical<br />
- New allergy - only if nil exist</i></p>
-<?php } ?>
- </td>
- </tr>
-
+ </td>
+ </tr> 
  </table>
 
  </td>
@@ -328,13 +316,8 @@ class="css_button link_submit" target='Main' onClick="top.restoreSession()">
  <?php echo xlt('Issues (Injuries/Medical/Allergy)'); ?>
  </div>
  <div style='float:left;margin-left:8px;margin-top:-3px'>
-<?php if ($GLOBALS['athletic_team']) { // they want the old-style popup window ?>
- <a href="#" class="css_button_small link_submit"
- onclick="return newissue()"><span><?php echo xlt('Add'); ?></span></a>
-<?php } else { ?>
  <a href="../../patient_file/summary/add_edit_issue.php" class="css_button_small link_submit iframe"
  onclick="top.restoreSession()"><span><?php echo xlt('Add'); ?></span></a>
-<?php } ?>
  </div>
  </td>
  </tr>

diff --git a/interface/globals.php b/interface/globals.php
@@ -169,7 +169,6 @@ function undoMagicQuotes($array, $topLevel=true) {
 include_once (dirname(__FILE__) . "/../library/date_functions.php");
 
 // Defaults for specific applications.
-$GLOBALS['athletic_team'] = false;
 $GLOBALS['weight_loss_clinic'] = false;
 $GLOBALS['ippf_specific'] = false;
 $GLOBALS['cene_specific'] = false;
@@ -219,8 +218,7 @@ function undoMagicQuotes($array, $topLevel=true) {
  $temp_css_theme_name = $gl_value;
  }
  else if ($gl_name == 'specific_application') {
- if ($gl_value == '1') $GLOBALS['athletic_team'] = true;
- else if ($gl_value == '2') $GLOBALS['ippf_specific'] = true;
+ if ($gl_value == '2') $GLOBALS['ippf_specific'] = true;
  else if ($gl_value == '3') $GLOBALS['weight_loss_clinic'] = true;
  }
  else if ($gl_name == 'inhouse_pharmacy') {

diff --git a/interface/main/calendar/add_edit_event.php b/interface/main/calendar/add_edit_event.php
@@ -1134,7 +1134,7 @@ function find_available(extra) {
 
  <tr>
  <td width='1%' nowrap>
- <b><?php echo ($GLOBALS['athletic_team'] ? xlt('Team/Squad') : xlt('Category')); ?>:</b>
+ <b><?php echo xlt('Category'); ?>:</b>
  </td>
  <td nowrap>
  <select name='form_category' onchange='set_category()' style='width:100%'>
@@ -1187,7 +1187,7 @@ function find_available(extra) {
 
  <tr>
  <td nowrap>
- <b><?php echo ($GLOBALS['athletic_team'] ? xlt('Team/Squad') : xlt('Title')); ?>:</b>
+ <b><?php echo xlt('Title'); ?>:</b>
  </td>
  <td nowrap>
  <input type='text' size='10' name='form_title' value='<?php echo attr($row['pc_title']); ?>'
@@ -1431,7 +1431,7 @@ function find_available(extra) {
 
  <tr>
  <td nowrap>
- <span id='title_apptstatus'><b><?php echo ($GLOBALS['athletic_team'] ? xlt('Session Type') : xlt('Status')); ?>:</b></span>
+ <span id='title_apptstatus'><b><?php echo xlt('Status'); ?>:</b></span>
  <span id='title_prefcat' style='display:none'><b><?php echo xlt('Pref Cat'); ?>:</b></span>
  </td>
  <td nowrap>