Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UI:Mobile] Add mobile screen view for the grade-report page #5409

Merged
merged 4 commits into from May 27, 2020
Merged

[UI:Mobile] Add mobile screen view for the grade-report page #5409

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc4dfe8
refactoring table view code
mukul-kmr-jha May 17, 2020
4e7f9f6
fix: duplicate ids
mukul-kmr-jha May 26, 2020
5c3d191
requested changes
mukul-kmr-jha May 26, 2020
a290482
Merge branch 'master' into grade_report
shailpatels May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
106 changes: 55 additions & 51 deletions site/app/templates/admin/Report.twig
View file
Open in desktop
@@ -1,63 +1,67 @@
<div class="content">

<div id="grade-report-cont" class="content">
<script>

$(document).ready(function() {

// Bind click listener to grade summaries button
$('#grade-summaries-button').click(function() {
$('#grade-summaries-last-run').html('Running...');
});

});

</script>

<h1>Grade Reports</h1>
{# This is a layout table #}
mukul-kmr-jha marked this conversation as resolved.
Show resolved Hide resolved
<table>
<tbody>
<tr>
<th style="width:50%;font-weight:normal;text-align:left">
<p> Pushing this button will update the grade summary data used to generate the rainbow grades reports.
</p>
</td>
<td style="width:5%"> </td>
<td style="position:relative;width:45%">
<button id="grade-summaries-button" onclick="location.href='{{ summaries_url }}'" class="btn btn-primary key_to_click" tabindex="0" style="width:100%;position:absolute;top:50%;transform:translate(0,-50%);">Generate Grade Summaries</button>
</td>
</tr>
<tr style="height:10px"><td colspan="3"></td></tr>
<tr>
<td style="width:50%"> </td>
<td style="width:5%"> </td>
<td style="text-align: center;width:45%">
<div id="grade-report">
<h1>Grade Reports</h1>
<div id="grade-report-summary" class="card">
<div class="title-cont">
Pushing this button will update the grade summary data used to generate the rainbow grades reports.
</div>
<div class="card-btn-cont">
<button id="grade-summaries-button"
onclick="location.href='{{ summaries_url }}'"
class="btn btn-primary key_to_click"
tabindex="0"
>
Generate Grade Summaries
</button>
<div class="card-btn-info">
Last ran: <span id="grade-summaries-last-run">{{ grade_summaries_last_run }}</span>
</td>
</tr>
<tr class="bar"><td colspan="3"></td></tr>
<tr class="bar"><td colspan="3"></td></tr>
<tr>
<th style="width:50%;font-weight:normal;text-align:left">
<p>Pushing this button will generate a CSV file (for download) with all student grades for all gradeables. </p>
</td>
<td style="width:5%"> </td>
<td style="width:45%; position:relative">
<button onclick="location.href='{{ csv_url }}'" class="btn btn-primary key_to_click" tabindex="0" style="width:100%;position:absolute;top:50%;transform:translate(0,-50%);">Generate CSV Report</button>
</td>
</tr>
<tr class="bar"><td colspan="3"></td></tr>
<tr class="bar"><td colspan="3"></td></tr>
<tr>
<th style="width:50%;font-weight:normal;text-align:left">
<p><em><b>NOTE: Work in Progress</b></em><br>Web interface for creation and customization of Rainbow Grades for this course.<br>
<a target=_blank href="https://submitty.org/instructor/rainbow_grades/">Rainbow Grades Documentation<i style="font-style:normal;" class="fa-question-circle"></i></a></p>
</td>
<td style="width:5%"> </td>
<td style="position:relative;width:45%">
<button onclick="location.href='{{ rainbow_grades_customization_url }}'" class="btn btn-primary key_to_click" tabindex="0" style="width:100%;position:absolute;top:50%;transform:translate(0,-50%);">Web-Based Rainbow Grades Generation</button>
</td>
</tr>
<tbody>
</table>
</div>
</div>
</div>
<div id="grade-report-csv" class="card">
<div class="title-cont">
Pushing this button will generate a CSV file (for download) with all student grades for all gradeables.
</div>
<div class="card-btn-cont">
<button onclick="location.href='{{ csv_url }}'"
class="btn btn-primary key_to_click"
tabindex="0"
>
Generate CSV Report
</button>
</div>
</div>
<div id="grade-report-rainbow" class="card">
<div class="title-cont">
<em><b>NOTE: Work in Progress</b></em>
<br>
Web interface for creation and customization of Rainbow Grades for this course.
<br>
<a target=_blank
href="https://submitty.org/instructor/rainbow_grades/"
>
Rainbow Grades Documentation
<i style="font-style:normal;" class="fa-question-circle"></i>
</a>
</div>
<div class="card-btn-cont">
<button onclick="location.href='{{ rainbow_grades_customization_url }}'"
class="btn btn-primary key_to_click"
tabindex="0"
>
Web-Based Rainbow Grades Generation
</button>
</div>
</div>
</div>
</div>
1 change: 1 addition & 0 deletions site/app/views/admin/ReportView.php
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@
class ReportView extends AbstractView {
public function showReportUpdates($grade_summaries_last_run) {
$this->core->getOutput()->addBreadcrumb('Grade Reports');
$this->core->getOutput()->addInternalCss('grade-report.css');
return $this->core->getOutput()->renderTwigTemplate("admin/Report.twig", [
'summaries_url' => $this->core->buildCourseUrl(['reports', 'summaries']),
'csv_url' => $this->core->buildCourseUrl(['reports', 'csv']),
Expand Down
56 changes: 56 additions & 0 deletions site/public/css/grade-report.css
View file
Open in desktop
@@ -0,0 +1,56 @@
.card {
display: flex;
padding: 24px 0;
text-align: left;
}

.title-cont {
flex: 1;
margin-right: 15px;
}

.card-btn-cont {
flex: 1;
text-align: center;
}
.card-btn-cont .btn {
white-space: normal;
width: 90%;
}


@media (max-width: 780px) {
.card {
/*border: 1px solid var(--btn-text-black); */
text-align: center;
flex-direction: column;
padding: 24px 12px;
margin-bottom: 14px;
transition: all 0.2s;
border: 1px solid var(--text-black);
}
.card:hover {
mukul-kmr-jha marked this conversation as resolved.
Show resolved Hide resolved
box-shadow: 1px 3px 5px;
translate: 0 -5px;
}
.title-cont {
width: unset;
}
.card-btn-cont {
width: unset;
margin: 12px 0;
}
.card-btn-info {
margin-top: 8px;
}
}

@media (max-width: 541px) {
#grade-report-cont.content {
padding: 20px;
margin: 15px 0;
}
#grade-report h1 {
font-weight: 500;
}
}