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

Show 800 level grad tie-ins on home screen listing

parent 4bc6be97
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
application/views/home.xhtml
+ 67
− 22
View file @ 8bcec3a1
...@@ -48,9 +48,20 @@ ...@@ -48,9 +48,20 @@
?> ?>
<tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>> <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
<!-- td><input type="checkbox" /></td --> <!-- td><input type="checkbox" /></td -->
<td><?php echo $originalCourse->subject . ' ' <td>
<?php echo $originalCourse->subject . ' '
. $originalCourse->courseNumber . $originalCourse->courseNumber
. $originalCourse->courseLetter; ?></td> . $originalCourse->courseLetter;
foreach($originalCourse->crosslistings as $crosslisting) {
if($crosslisting->type == 'home listing') {
continue;
}
if($crosslisting->subject == $course->subject) {
echo '/' . $crosslisting->courseNumber . $crosslisting->courseLetter;
}
}
?>
</td>
<td><?php echo $originalCourse->getHomeCollege()->name; ?></td> <td><?php echo $originalCourse->getHomeCollege()->name; ?></td>
<td><?php echo $request->type->name; ?></td> <td><?php echo $request->type->name; ?></td>
<td> <td>
...@@ -103,9 +114,20 @@ ...@@ -103,9 +114,20 @@
?> ?>
<tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>> <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
<!-- td><input type="checkbox" /></td --> <!-- td><input type="checkbox" /></td -->
<td><?php echo $originalCourse->subject . ' ' <td>
<?php echo $originalCourse->subject . ' '
. $originalCourse->courseNumber . $originalCourse->courseNumber
. $originalCourse->courseLetter; ?></td> . $originalCourse->courseLetter;
foreach($originalCourse->crosslistings as $crosslisting) {
if($crosslisting->type == 'home listing') {
continue;
}
if($crosslisting->subject == $course->subject) {
echo '/' . $crosslisting->courseNumber . $crosslisting->courseLetter;
}
}
?>
</td>
<td><?php echo $originalCourse->getHomeCollege()->name; ?></td> <td><?php echo $originalCourse->getHomeCollege()->name; ?></td>
<td><?php echo $request->type->name; ?></td> <td><?php echo $request->type->name; ?></td>
<td><?php echo $request->getCurrentApprovalBody()->name; ?></td> <td><?php echo $request->getCurrentApprovalBody()->name; ?></td>
...@@ -163,12 +185,12 @@ ...@@ -163,12 +185,12 @@
<table class="course_list"> <table class="course_list">
<tr> <tr>
<!-- th id="check">&#160;</th --> <!-- th id="check">&#160;</th -->
<th id="course"><a href="/Home/SortBy/Course">Course</a></th> <th class="course"><a href="/Home/SortBy/Course">Course</a></th>
<th id="college"><a href="/Home/SortBy/College">College</a></th> <th class="college"><a href="/Home/SortBy/College">College</a></th>
<th id="type"><a href="/Home/SortBy/Type">Type</a></th> <th class="type"><a href="/Home/SortBy/Type">Type</a></th>
<th id="pending_action">Pending Action</th> <th class="pending_action">Pending Action</th>
<th id="status">Status</th> <th class="status">Status</th>
<th id="view_edit">View/Edit</th> <th class="view_edit">View/Edit</th>
</tr> </tr>
<?php <?php
$row = 0; $row = 0;
...@@ -181,12 +203,23 @@ ...@@ -181,12 +203,23 @@
?> ?>
<tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>> <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
<!-- td><input type="checkbox" /></td --> <!-- td><input type="checkbox" /></td -->
<td><?php echo $originalCourse->subject . ' ' <td>
<?php echo $originalCourse->subject . ' '
. $originalCourse->courseNumber . $originalCourse->courseNumber
. $originalCourse->courseLetter; ?></td> . $originalCourse->courseLetter;
foreach($originalCourse->crosslistings as $crosslisting) {
if($crosslisting->type == 'home listing') {
continue;
}
if($crosslisting->subject == $course->subject) {
echo '/' . $crosslisting->courseNumber . $crosslisting->courseLetter;
}
}
?>
</td>
<td><?php echo $originalCourse->getHomeCollege()->name; ?></td> <td><?php echo $originalCourse->getHomeCollege()->name; ?></td>
<td><?php echo $request->type->name; ?></td> <td><?php echo $request->type->name; ?></td>
<td><?php echo $request->getCurrentAction()->name; ?></td> <td><?php echo htmlentities($request->getCurrentAction()->name, null, 'UTF-8'); ?></td>
<td> <td>
<?php <?php
if ($request->getCurrentAction()) { if ($request->getCurrentAction()) {
...@@ -197,7 +230,8 @@ ...@@ -197,7 +230,8 @@
+ $request->getCurrentAction()->getResultStatusStrings($request, $this->user)); + $request->getCurrentAction()->getResultStatusStrings($request, $this->user));
// //
} }
?> </td> ?>
</td>
<td> <td>
<?php <?php
$lastViewTime = RequestViewTimes::getInstance()->getViewTimeForUserAndRequest($this->user, $request); $lastViewTime = RequestViewTimes::getInstance()->getViewTimeForUserAndRequest($this->user, $request);
...@@ -240,12 +274,12 @@ ...@@ -240,12 +274,12 @@
<table class="course_list"> <table class="course_list">
<tr> <tr>
<!-- th id="check">&#160;</th --> <!-- th id="check">&#160;</th -->
<th id="course">Course</th> <th class="course">Course</th>
<th id="college">College</th> <th class="college">College</th>
<th id="type">Type</th> <th class="type">Type</th>
<th id="approval_body">Approval Body</th> <th class="approval_body">Approval Body</th>
<th id="status">Status</th> <th class="status">Status</th>
<th id="view_edit">View/Edit</th> <th class="view_edit">View/Edit</th>
</tr> </tr>
<?php <?php
$row = 0; $row = 0;
...@@ -258,9 +292,20 @@ ...@@ -258,9 +292,20 @@
?> ?>
<tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>> <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
<!-- td><input type="checkbox" /></td --> <!-- td><input type="checkbox" /></td -->
<td><?php echo $originalCourse->subject . ' ' <td>
<?php echo $originalCourse->subject . ' '
. $originalCourse->courseNumber . $originalCourse->courseNumber
. $originalCourse->courseLetter; ?></td> . $originalCourse->courseLetter;
foreach($originalCourse->crosslistings as $crosslisting) {
if($crosslisting->type == 'home listing') {
continue;
}
if($crosslisting->subject == $course->subject) {
echo '/' . $crosslisting->courseNumber . $crosslisting->courseLetter;
}
}
?>
</td>
<td><?php echo $originalCourse->getHomeCollege()->name; ?></td> <td><?php echo $originalCourse->getHomeCollege()->name; ?></td>
<td><?php echo $request->type->name; ?></td> <td><?php echo $request->type->name; ?></td>
<td><?php echo $request->getCurrentApprovalBody()->name; ?></td> <td><?php echo $request->getCurrentApprovalBody()->name; ?></td>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment