Skip to content
Snippets Groups Projects
Commit b6ce144d authored by Roger Feese's avatar Roger Feese
Browse files

Merge branch 'chief-adviser-to-advisor' into 'master' 

Chief adviser to advisor

Adding changes to accomodate change from CHIEF ADVISOR to ADVISOR.

See merge request !28
parents 8133244e 284c58ec
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
application/modules/bulletin/models/SectionModel.php
+ 7
− 4
View file @ b6ce144d
......@@ -449,7 +449,7 @@ class Bulletin_SectionModel extends Unl_Model
'Other University Programs' => array(
'Academic Policies & Procedures' => array(
'creditHourDefinition' => 'Credit Hour Definition',
'academicAdviserAssignment' => 'Academic Adviser Assignment',
'academicAdvisorAssignment' => 'Academic Advisor Assignment',
'studentsResponsibilitiesInAcademicAdvising' => 'Students Responsibilities in Academic Advising',
'maximumCreditHourLoad' => 'Maximum Credit Hour Load',
'classAttendance' => 'Class Attendance',
......@@ -546,9 +546,12 @@ class Bulletin_SectionModel extends Unl_Model
$key = strtr($key, array(' ' => ''));
$key[0] = strtolower($key[0]);
/* Retaining old Adviser definitions to transition them to Advisor */
$keyMap = array(
'adviser' => 'chiefAdviser',
'chiefAdvisers' => 'chiefAdviser',
'advisor' => 'advisor',
'advisors' => 'advisor',
'chiefAdviser' => 'advisor',
'chiefAdvisers' => 'advisor',
'degree' => 'degreeOffered',
'degreesOffered' => 'degreeOffered',
);
......@@ -644,7 +647,7 @@ EOF;
<p class="quick-points"><span class="quick-point-bold">HOURS REQUIRED:</span> {$htmlData['hoursRequired']}</p>
<p class="quick-points"><span class="quick-point-bold">MINIMUM CUMULATIVE GPA:</span> {$htmlData['minimumCumulativeGpa']}</p>
<p class="quick-points"><span class="quick-point-bold">MINOR AVAILABLE:</span> {$htmlData['minorAvailable']}</p>
<p class="quick-points"><span class="quick-point-bold">CHIEF ADVISER:</span> {$htmlData['chiefAdviser']}</p>
<p class="quick-points"><span class="quick-point-bold">ADVISOR:</span> {$htmlData['advisor']}</p>
EOF;
}
......
application/modules/bulletin/models/UtilityModel.php
+ 7
− 2
View file @ b6ce144d
......@@ -141,18 +141,21 @@ class Bulletin_UtilityModel implements Creq_Model_UtilityInterface
if (preg_match('/\s*([A-Z\s]+)+:/', $point_desc, $matches)) {
$value = trim(str_replace($matches[0], '', (string)$quickpoint));
$attr = $matches[1];
/* Keeping old ADVISER definitions to transition to ADVISOR. */
switch($attr) {
case 'COLLEGE':
break;
case 'MAJOR':
break;
case 'OFFERED';
break;
case 'OFFERED':
case 'DEGREE OFFERED':
case 'DEGREES OFFERED':
case 'HOURS REQUIRED':
case 'MINOR AVAILABLE':
case 'CHIEF ADVISER':
case 'CHIEF ADVISERS':
case 'CHIEF ADVISOR':
case 'CHIEF ADVISORS':
case 'MINOR ONLY':
case 'DEPARTMENT':
case 'DEPARTMENTS':
......@@ -160,6 +163,8 @@ class Bulletin_UtilityModel implements Creq_Model_UtilityInterface
case 'DEGREE':
case 'ADVISERS':
case 'ADVISER':
case 'ADVISORS':
case 'ADVISOR':
$attr = explode(' ', strtolower($attr));
$attr = array_map('ucfirst', $attr);
$attr = implode(' ', $attr);
......
application/modules/bulletin/views/scripts/edit/index.phtml
+ 3
− 3
View file @ b6ce144d
......@@ -43,8 +43,8 @@ $this->layout()->pageTitle = 'Editing: ' . ($this->section->getMajor() ? $this->
<?php echo $this->formText('minorAvailable', $this->minorAvailable); ?><br/>
</label>
<label>
Chief Adviser<br/>
<?php echo $this->formText('chiefAdviser', $this->chiefAdviser); ?><br/>
Advisor<br/>
<?php echo $this->formText('advisor', $this->advisor); ?><br/>
</label>
<?php } ?>
<?php if ($this->section->getMajor()) { ?>
......@@ -52,7 +52,7 @@ $this->layout()->pageTitle = 'Editing: ' . ($this->section->getMajor() ? $this->
<h2><?php echo $humanName; ?></h2>
<?php if ($machineName == 'description') { ?>
<p>Describes department/unit/sequence/program. Includes listing of people (i.e. faculty, chair/head, adviser). Introduces discipline and may include scholarship information and introduction to requirements.</p>
<p>Describes department/unit/sequence/program. Includes listing of people (i.e. faculty, chair/head, advisor). Introduces discipline and may include scholarship information and introduction to requirements.</p>
<?php } else if ($machineName == 'majorRequirements') { ?>
<p>Core Requirements – List courses identified as ‘core’ for major.</p>
<p>Specific Major Requirements – List courses not defined as ‘core’ and note required as part of emphasis/track/option/concentration.</p>
......
application/modules/bulletin/views/scripts/view/index.phtml
+ 2
− 2
View file @ b6ce144d
......@@ -30,7 +30,7 @@ $proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents,
<b>Hours Required:</b> <?php echo $this->htmlDiff($this->escape($originalSection['hoursRequired']), $this->escape($proposedSection['hoursRequired'])); ?><br/>
<b>Minimum Cumulative GPA:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minimumCumulativeGpa']), $this->escape($proposedSection['minimumCumulativeGpa'])); ?><br/>
<b>Minor Available:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minorAvailable']), $this->escape($proposedSection['minorAvailable'])); ?><br/>
<b>Chief Adviser:</b> <?php echo $this->htmlDiff($this->escape($originalSection['chiefAdviser']), $this->escape($proposedSection['chiefAdviser'])); ?><br/>
<b>Advisor:</b> <?php echo $this->htmlDiff($this->escape($originalSection['advisor']), $this->escape($proposedSection['advisor'])); ?><br/>
<?php } ?>
<?php echo substr($this->proposedFileContents, strpos($this->proposedFileContents, '<h2 class="sec_header content-box-h-1">')); ?>
</div>
......@@ -45,7 +45,7 @@ $proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents,
<b>Hours Required:</b> <?php echo $this->htmlDiff($this->escape($originalSection['hoursRequired']), $this->escape($proposedSection['hoursRequired'])); ?><br/>
<b>Minimum Cumulative GPA:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minimumCumulativeGpa']), $this->escape($proposedSection['minimumCumulativeGpa'])); ?><br/>
<b>Minor Available:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minorAvailable']), $this->escape($proposedSection['minorAvailable'])); ?><br/>
<b>Chief Adviser:</b> <?php echo $this->htmlDiff($this->escape($originalSection['chiefAdviser']), $this->escape($proposedSection['chiefAdviser'])); ?><br/>
<b>Advisor:</b> <?php echo $this->htmlDiff($this->escape($originalSection['advisor']), $this->escape($proposedSection['advisor'])); ?><br/>
<?php } ?>
<?php echo substr($this->proposedFileContents, strpos($this->proposedFileContents, '<h2 class="sec_header content-box-h-1">')); ?>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment