Skip to content

Commit

Permalink
Merge pull request #56 from SlateFoundation/development
Browse files Browse the repository at this point in the history 
Release: slate v2.1.2
  • Loading branch information
@themightychris
themightychris committed Nov 3, 2015
2 parents 7444dae + 9570f37 commit 69a594f
Show file tree
Hide file tree
Showing 10 changed files with 1,178 additions and 27 deletions.
251 changes: 251 additions & 0 deletions html-templates/progress/narratives/print.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<style type="text/css">
body, dd, li, p {
font-family: Palatino Linotype, Book Antiqua, Palatino, serif !important;
font-size: 13pt !important;
}
body {
margin: auto;
orphans: 3;
padding: .25in 0.5in;
width: 8.5in;
widows: 3;
}
header, h1, h2, h3, dt, th, td.grade {
font-family: Helvetica Neue, Helvetica, Arial, Verdana, sans-serif !important;
}
p {
margin: 1em 0 0 !important;
}
a, a:link, a:visited {
color: #666;
font-family: Consolas, Menlo, Monaco, Courier, monospace;
font-size: 12pt;
text-decoration: none;
}
header {
display: block;
border-bottom: 1px solid #666;
padding-bottom: 0.25em;
}
.prompts {
border-collapse: collapse;
margin-bottom: 1em;
width: 100%;
page-break-before: avoid;
}
.prompt {
text-align: left;
}
.prompt {
width: 80%;
}
.prompts .grade {
text-align: right;
}
.prompts th,
.prompts td {
padding: .5em 0;
}
.prompts td {
border-top: 1px dotted #999;
}
.prompts tr:first-child td {
border-top: 0;
}
.grade {
white-space: nowrap;
}
.empty-report {
text-align: center;
font-style: italic;
}
.student {
page-break-before: always;
}
.student:first-of-type {
page-break-before: auto;
}
header h1 {
font-size: 24pt;
margin: 0;
}
header h1 .pretitle {
display: block;
font-size: 12pt;
}
header h3 {
font-size: 12pt;
margin: 1em 0 0;
}
header .advisor {
float: right;
font-size: 12pt;
font-weight: 900;
line-height: 8pt;
padding-top: 20pt;
text-align: right;
}
header .advisor a {
display: block;
font-size: 10pt;
font-weight: normal;
line-height: 18pt;
text-align: center;
}
dt {
clear: both;
color: #666;
float: left;
font-size: 9pt;
line-height: 16pt;
margin: 0;
text-transform: uppercase;
}
dd {
margin: 0 0 .5em 1.25in;
}
dd.grade {
font-weight: 900;
page-break-before: avoid;
page-break-after: avoid;
}
dt.assessment,
dt.comments {
display: inline-block;
float: none;
page-break-after: avoid;
}
dd.standards,
dd.assessment,
dd.comments {
clear: left;
line-height: 1.4;
margin: 0.5em .25in 1em;
}
.assessment p,
.comments p {
line-height: 1.4 !important;
}
article, section {
display: block;
margin-bottom: 1em;
}
.narrative {
border-bottom: 1px dotted #999;
}
.narrative h2 {
page-break-after: avoid;
}
dl {
page-break-before: avoid;
}
</style>
</head>
<body>
{$gradeLabels = array(
"N/A" = "Standard not Applicable during the Semester"
,1 = "Not currently meeting expectations"
,2 = "Approaching expectations"
,3 = "Meeting expectations"
,4 = "Exceeding expectations"
)}

{$lastReport = false}

<section class="student">
{foreach item=Report from=$data}

{if $lastReport->StudentID != $Report->StudentID}
{if $lastReport}
</section><section class="student">
{/if}
<header>
{if $Report->Student->Advisor}
<div class="advisor">
Advisor: {$Report->Student->Advisor->FullName}
<a href="mailto:{$Report->Student->Advisor->Email}">{$Report->Student->Advisor->Email}</a>
</div>
{/if}
<h1>
<span class="pretitle">Narrative report for</span>
{$Report->Student->FullName}
</h1>
<h3 class="term">{$Report->Term->Title|escape}</h3>
</header>
{/if}
<article class="narrative">

<h2>{$Report->Section->Title|escape}</h2>

<dl>
{if $Report->Section->Instructors[0]->FullName}
<dt class="instructor">Instructor</dt>
<dd class="instructor">
{$Report->Section->Instructors[0]->FullName}
{if $Report->Section->Instructors[0]->Email}
<a href="mailto:{$Report->Section->Instructors[0]->Email}">&lt;{$Report->Section->Instructors[0]->Email}&gt;</a>
{/if}
</dd>
{/if}

{if $Report->Grade}
<dt class="grade">Overall Grade</dt>
<dd class="grade">{$Report->Grade}</dd>
{/if}


<!-- begin standards -->
{$standardsGrades = $Report->getStandardsGrades()}
{if $Report->getWorksheetAssignment() && count($standardsGrades)}
<dt class="standards">Standards</dt>
<dd class="standards">
<article class="standard-worksheet">
<table class="prompts">
<tbody>
{foreach item=Grade from=$standardsGrades}
<tr>
<td class="prompt">{$Grade->Prompt->Prompt|escape}</td>
<td class="grade">{if $Grade->Grade != "N/A"}{$gradeLabels[$Grade->Grade]}{else}{$Grade->Grade}{/if}</td>
</tr>
{/foreach}
</tbody>
</table>
</article>
</dd>
{/if}
<!-- end standards -->

{if $Report->Assessment}
<dt class="assessment">Assessment</dt>
<dd class="assessment">{$Report->Assessment}</dd>
{/if}

{if $Report->Comments}
<dt class="comments">Comments</dt>
<dd class="comments">{$Report->Comments}</dd>
{/if}

</dl>
</article>

{$lastReport = $Report}
{/foreach}

</body>
</html>
53 changes: 35 additions & 18 deletions php-classes/Slate/Courses/SectionsRequestHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@

namespace Slate\Courses;

use DB;

use Emergence\People\Person;
use Emergence\People\User;
use Emergence\CMS\BlogPost;
use Emergence\CMS\BlogRequestHandler;
#use SpreadSheetWriter;
#use Slate\Term;
use Slate\Term;
#use Slate\Courses\SectionParticipant;

class SectionsRequestHandler extends \RecordsRequestHandler
Expand Down Expand Up @@ -173,23 +176,37 @@ public static function handleStudentsRequest(Section $Section)

public static function handleBrowseRequest($options = array(), $conditions = array(), $responseID = null, $responseData = array())
{
# if (empty($_REQUEST['AllCourses']) && $GLOBALS['Session']->PersonID) {
# $conditions[] = 'ID IN (SELECT CourseSectionID FROM course_section_participants WHERE PersonID = '.$GLOBALS['Session']->PersonID.')';
# }
#
# if (!empty($_REQUEST['TermID'])) {
# $term = Term::getByID($_REQUEST['TermID']);
# $concurrentTerms = $term->getConcurrentTermIDs();
# $containedTerms = $term->getContainedTermIDs();
# $termIDs = array_unique(array_merge($concurrentTerms, $containedTerms));
#
# $conditions[] = sprintf('TermID IN (%s)',join(',',$termIDs));
# }
#
# if (!empty($_REQUEST['start']) && !empty($_REQUEST['limit'])) {
# $options['offset'] = $_REQUEST['start'];
# $options['limit'] = $_REQUEST['limit'];
# }
if (!empty($_REQUEST['term'])) {
if ($_REQUEST['term'] == 'current') {
if (!$Term = Term::getClosest()) {
return static::throwInvalidRequestError('No current term could be found');
}
} elseif (!$Term = Term::getByHandle($_REQUEST['term'])) {
return static::throwNotFoundError('term not found');
}

$conditions[] = sprintf('TermID IN (%s)', join(',', $Term->getRelatedTermIDs()));
}

if (!empty($_REQUEST['enrolled_user'])) {
if ($_REQUEST['enrolled_user'] == 'current') {
$GLOBALS['Session']->requireAuthentication();
$EnrolledUser = $GLOBALS['Session']->Person;
} elseif (!$EnrolledUser = User::getByHandle($_REQUEST['enrolled_user'])) {
return static::throwNotFoundError('enrolled_user not found');
}

$enrolledSectionIds = DB::allValues(
'ID',
'SELECT ID FROM `%s` WHERE PersonID = %u',
[
SectionParticipant::$tableName,
$EnrolledUser->ID
]
);

$conditions[] = sprintf('ID IN (%s)', count($enrolledSectionIds) ? join(',', $enrolledSectionIds) : '0');
}

return parent::handleBrowseRequest($options, $conditions, $responseID, $responseData);
}
Expand Down
Loading

0 comments on commit 69a594f

Please sign in to comment.