Skip to content
Snippets Groups Projects
Commit 56a30ee5 authored by Tim Steiner's avatar Tim Steiner
Browse files

Updates to the way RemoveCourse requests are entered and viewed.

parent ce797092
No related branches found
No related tags found
No related merge requests found
...@@ -115,7 +115,11 @@ class RequestController extends Nmc_Controller_Action ...@@ -115,7 +115,11 @@ class RequestController extends Nmc_Controller_Action
Nmc_Registry_Session::getInstance()->course = $course; Nmc_Registry_Session::getInstance()->course = $course;
$out = new Application_View(); $out = new Application_View();
if ($request->type->name == 'RemoveCourse') {
$out->location = '/Request/SupportiveMaterial';
} else {
$out->location = '/Request/CourseID'; $out->location = '/Request/CourseID';
}
echo $out->render('unlModernWrapper.xhtml'); echo $out->render('unlModernWrapper.xhtml');
} }
...@@ -211,6 +215,10 @@ class RequestController extends Nmc_Controller_Action ...@@ -211,6 +215,10 @@ class RequestController extends Nmc_Controller_Action
$currentGeneration = $currentGeneration->getParentGeneration(); $currentGeneration = $currentGeneration->getParentGeneration();
} }
if ($request->type->name != 'ChangeCourse') {
$currentGeneration = null;
}
$comments = RequestComments::getInstance()->fetchWithRequest($request); $comments = RequestComments::getInstance()->fetchWithRequest($request);
$user = Nmc_User::getInstance()->getUser(); $user = Nmc_User::getInstance()->getUser();
...@@ -841,6 +849,9 @@ class RequestController extends Nmc_Controller_Action ...@@ -841,6 +849,9 @@ class RequestController extends Nmc_Controller_Action
$currentGeneration = $currentGeneration->getParentGeneration(); $currentGeneration = $currentGeneration->getParentGeneration();
} }
if ($request->type->name != 'ChangeCourse') {
$currentGeneration = null;
}
$out = new Application_View(); $out = new Application_View();
//$out->addSidebarModule('requestProgress'); //$out->addSidebarModule('requestProgress');
......
...@@ -23,7 +23,14 @@ ...@@ -23,7 +23,14 @@
<?php <?php
} else { } else if ($this->request->type->name == 'RemoveCourse') {
/*****************************REMOVE COURSE************************************/
?>
<div class="removed">
<?php echo $this->bulletinEntry($proposedGeneration, $this->request); ?>
</div>
<?php } else {
/*****************************NEW COURSE***************************************/ /*****************************NEW COURSE***************************************/
echo $this->bulletinEntry($proposedGeneration, $this->request); echo $this->bulletinEntry($proposedGeneration, $this->request);
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<div class="content"> <div class="content">
<ul> <ul>
<?php if ($this->request instanceof Request && $this->request->type->name != 'RemoveCourse') { ?>
<li class="completed"> <li class="completed">
<a href="/Request/CourseID">Course ID</a> <a href="/Request/CourseID">Course ID</a>
</li> </li>
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
<li> <li>
<a href="/Request/GraduateTieIn">Graduate Tie-in</a> <a href="/Request/GraduateTieIn">Graduate Tie-in</a>
</li> </li>
<?php } ?>
<li> <li>
<a href="/Request/SupportiveMaterial">Supportive Material</a> <a href="/Request/SupportiveMaterial">Supportive Material</a>
</li> </li>
......
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
#viewRequest div.proposed { #viewRequest div.proposed {
float: right; float: right;
} }
#viewRequest div.removed {
color: #800;
text-decoration: line-through;
}
#viewRequest .current ins { #viewRequest .current ins {
display: none; display: none;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment