Skip to content

Commit

Permalink
Merged in LAQ-19 (pull request #35)
Browse files Browse the repository at this point in the history 
LAQ-19 - LAQ-55
  • Loading branch information
@illiphilli
illiphilli committed Oct 14, 2016
2 parents fa82ca9 + 774dd42 commit 18dd566
Show file tree
Hide file tree
Showing 3 changed files with 182 additions and 141 deletions.
63 changes: 42 additions & 21 deletions src/main/resources/public/assets/js/pulse/_pulse.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,32 +69,31 @@
// opacity: 1;
}
}
.assignment-marker {
stroke: #999999;
stroke-width: 2;
&.lab {
stroke: blue;
}
&.exam {
stroke: red;
}
&.quiz {
stroke: green;
}
&.report {
stroke: orange;
}
&:hover {
stroke-width: 6;
}
}
.pulse-list-item:hover rect {
fill: #dedeff;
}
}

.chart-container {
position: relative;
.tool-tip-info {
position: absolute;
background: #fff;
padding: 0px 10px;
border-radius: 5px;
box-shadow: 2px 2px 2px rgba(0,0,0,0.5);
border: 1px solid #999;
color: #005695;
}
.info-label {
text-transform: uppercase;
font-weight: bold;
color: #999;
font-size: 11px;
}
.info-value {
font-weight: bold;
font-size: 13px;
}
}
// classes
.class-list {
Expand All @@ -115,4 +114,26 @@
.plot-day {
background: blue;
}
// }
// }

.tooltips {
.tool-tip-info {
position: absolute;
background: #fff;
padding: 0px 10px;
border-radius: 5px;
box-shadow: 2px 2px 2px rgba(0,0,0,0.5);
border: 1px solid #999;
color: #005695;
}
.info-label {
text-transform: uppercase;
font-weight: bold;
color: #999;
font-size: 11px;
}
.info-value {
font-weight: bold;
font-size: 13px;
}
}
172 changes: 89 additions & 83 deletions src/main/resources/public/assets/js/pulse/pulse.html
View file
Original file line number Diff line number Diff line change
@@ -1,97 +1,103 @@
<section>
<div class="od-breadcrumb">
<a href="" ui-sref="index.courselist({groupId: null})">Class List</a>
<span ng-if="listType == 'students' || listType == 'student'">

<span class="dropdown">
&gt; <a href="" data-toggle="dropdown">{{currentCourse.label}}
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="course in classes">
<a href="#" ng-click="$emit('chart-change', {id: course.id, type: 'course', notify: true})">{{course.label}}</a>
</li>
</ul>
</span>
<section class="col-md-12">
<div class="col-md-11">
<div class="od-breadcrumb">
<a href="" ui-sref="index.courselist({groupId: null})">Class List</a>
<span ng-if="listType == 'students' || listType == 'student'">

<span class="dropdown">
&gt; <a href="" data-toggle="dropdown">{{currentCourse.label}}
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="course in classes">
<a href="#" ng-click="$emit('chart-change', {id: course.id, type: 'course', notify: true})">{{course.label}}</a>
</li>
</ul>
</span>

<span>&gt; Students</span>
<span>&gt; Students</span>

<span class="dropdown" ng-if="listType == 'student'">
&gt; <a href="" data-toggle="dropdown">{{currentStudent.label}}
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="student in currentCourse.students">
<a href="#" ng-click="$emit('chart-change', {id: student.id, type: 'student', notify: true})">{{student.label}}</a>
</li>
</ul>
<span class="dropdown" ng-if="listType == 'student'">
&gt; <a href="" data-toggle="dropdown">{{currentStudent.label}}
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li ng-repeat="student in currentCourse.students">
<a href="#" ng-click="$emit('chart-change', {id: student.id, type: 'student', notify: true})">{{student.label}}</a>
</li>
</ul>
</span>
</span>
</span>
</div>

<div class="chart-container">
<div class="filters" ng-show="chartInitialized">
<label for="assignment-toggle" ng-click="$emit('draw-assignments')">
<input id="assignment-toggle" type="checkbox" ng-model="assignmentOverlay" ng-init="assignmentOverlay = true"> Assignment Overlay
</label>
</div>
<div id="pulse-chart">

</div>

<div class="tool-tip-info tool-tip-event-info" ng-show="chartInfo">
<i class="fa fa-info-circle"></i>
<span>
<span class="info-label">Date:</span>
<span class="info-value">{{chartInfo.date | amDateFormat:'M-D'}}</span>
</span>
<span>
<span class="info-label">Events:</span>
<span class="info-value">{{chartInfo.events}}</span>
</span>
</div>
<div class="chart-container">
<div class="filters" ng-show="chartInitialized">
<label for="assignment-toggle" ng-click="$emit('draw-assignments')" ng-show="listType == 'students' || listType == 'student'">
<input id="assignment-toggle" type="checkbox" ng-model="assignmentOverlay" ng-init="assignmentOverlay = true"> Assignment Overlay
</label>
</div>


<div class="tool-tip-info tool-tip-assignment-info" ng-show="assignmentInfo">
<i class="fa fa-info-circle"></i>
<span>
<span class="info-label">Title:</span>
<span class="info-value">{{assignmentInfo.label}}</span>
</span>
<span>
<span class="info-label">Date:</span>
<span class="info-value">{{assignmentInfo.date | amDateFormat:'M-D'}}</span>
</span>
<span>
<span class="info-label">Type:</span>
<span class="info-value">{{assignmentInfo.events}}</span>
</span>
</div>
</div>
<div id="pulse-chart">

<div class="modal fade" id="emailModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Email {{emailstudent.name}}</h4>
</div>
<div class="modal-body">
<div ng-if="sent" class="alert alert-success">
Email sent to {{emailstudent.name}}.
</div>
<form action="">
<div class="form-group">
<label for="exampleInputEmail1">message</label>
<textarea class="form-control"></textarea>

</div>

<div class="modal fade" id="emailModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Email {{emailstudent.name}}</h4>
</div>
<div class="modal-body">
<div ng-if="sent" class="alert alert-success">
Email sent to {{emailstudent.name}}.
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" ng-click="sent = 1">Send Email</button>
<form action="">
<div class="form-group">
<label for="exampleInputEmail1">message</label>
<textarea class="form-control"></textarea>

</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" ng-click="sent = 1">Send Email</button>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<div class="ui-view" ng-if="listType == 'student'"></div>
<div class="ui-view" ng-if="listType == 'student'"></div>

<div class="tooltips">
<div class="tool-tip-info tool-tip-event-info" ng-show="chartInfo">
<i class="fa fa-info-circle"></i>
<span>
<span class="info-label">Date:</span>
<span class="info-value">{{chartInfo.date | amDateFormat:'M-D'}}</span>
</span>
<span>
<span class="info-label">Events:</span>
<span class="info-value">{{chartInfo.events}}</span>
</span>
</div>


<div class="tool-tip-info tool-tip-assignment-info" ng-show="assignmentInfo">
<i class="fa fa-info-circle"></i>
<span>
<span class="info-label">Title:</span>
<span class="info-value">{{assignmentInfo.label}}</span>
</span>
<span>
<span class="info-label">Date:</span>
<span class="info-value">{{assignmentInfo.date | amDateFormat:'M-D'}}</span>
</span>
<span>
<span class="info-label">Type:</span>
<span class="info-value">{{assignmentInfo.events}}</span>
</span>
</div>
</div>
Loading

0 comments on commit 18dd566

Please sign in to comment.