From 2c895efe806b8401f447f1a7d6e27c62b0780918 Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Thu, 7 May 2015 13:58:24 -0500
Subject: [PATCH] Initial modifications to move from ChiefAdvisor to Advisor.
---
application/modules/bulletin/models/SectionModel.php | 11 +++++++----
application/modules/bulletin/models/UtilityModel.php | 3 +++
.../modules/bulletin/views/scripts/edit/index.phtml | 6 +++---
.../modules/bulletin/views/scripts/view/index.phtml | 4 ++--
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/application/modules/bulletin/models/SectionModel.php b/application/modules/bulletin/models/SectionModel.php
index 6b311ad0..2bc541f9 100644
--- a/application/modules/bulletin/models/SectionModel.php
+++ b/application/modules/bulletin/models/SectionModel.php
@@ -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;
}
diff --git a/application/modules/bulletin/models/UtilityModel.php b/application/modules/bulletin/models/UtilityModel.php
index 41fbae1e..ee10c4e7 100644
--- a/application/modules/bulletin/models/UtilityModel.php
+++ b/application/modules/bulletin/models/UtilityModel.php
@@ -141,6 +141,7 @@ 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;
@@ -160,6 +161,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);
diff --git a/application/modules/bulletin/views/scripts/edit/index.phtml b/application/modules/bulletin/views/scripts/edit/index.phtml
index 083a69c7..9bdfbe1d 100644
--- a/application/modules/bulletin/views/scripts/edit/index.phtml
+++ b/application/modules/bulletin/views/scripts/edit/index.phtml
@@ -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>
diff --git a/application/modules/bulletin/views/scripts/view/index.phtml b/application/modules/bulletin/views/scripts/view/index.phtml
index 144dddf2..4cd7d4c7 100644
--- a/application/modules/bulletin/views/scripts/view/index.phtml
+++ b/application/modules/bulletin/views/scripts/view/index.phtml
@@ -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>
--
GitLab