Skip to content

yotta / pictogram

Go to a project
Commit 3f57f07f by Jose Antonio
Options

Merged branch develop into develop

parents f40ce762 cfb1a18a
Inline Side-by-side
Showing with 176 additions and 115 deletions
sails/src/assets/scripts/modules/student/views/reports.html
<!-- Reports tab-->
<div class="panel panel-default student_tab_panel">
<div class="panel-body">
<div class="row">
<div class="col-md-4">
<h1>{{'methods' | translate}}</h1>
<!-- reports title -->
<div id="reportsTitle" hidden>
<br>
<div class="row">
<div class="col-xs-2">
<img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram">
</div>
<div class="col-xs-5">
<h3 style="margin-top:0px;">{{ user.office.name }}</h3>
</div>
<div class="col-xs-5">
<h3 style="margin-top:0px;">{{ studentData.name }} {{ studentData.surname }}</h3>
<h4><b>{{ printName | translate }}</b> {{ 'tpl_date_frame' | translate:{'begin':reportDateSince, 'end':reportDateTo} }}</h4>
</div>
</div>
</div>
<div class="row" id="filter">
<div class="col-md-3">
<!-- filter selector -->
<div id="filter">
<div class="row">
<div class="col-xs-12">
<h1 class="page-header">{{'filter' | translate}}</h1>
</div>
</div>
<!-- selectors -->
<div class="row">
<div class="col-xs-3 col-xs-offset-1">
<div class="form-group">
<p class="input-group">
<select class="form-control" name="method_select" id="method_select" ng-model="selected_method">
......@@ -17,18 +36,18 @@
</select>
</p>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<p class="input-group">
<input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="reportDateSince" placeholder="{{ 'since' | translate }}" is-open="openedSince" close-text="{{'close' | translate}}" />
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="openCalendar($event,1)"><i class="glyphicon glyphicon-calendar"></i></button>
</span>
</p>
</div>
</div>
<div class="col-md-3">
<div class="col-xs-3">
<div class="form-group">
<p class="input-group">
<input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="reportDateSince" placeholder="{{ 'since' | translate }}" is-open="openedSince" close-text="{{'close' | translate}}" />
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="openCalendar($event,1)"><i class="glyphicon glyphicon-calendar"></i></button>
</span>
</p>
</div>
</div>
<div class="col-xs-3">
<div class="form-group">
<p class="input-group">
<input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="reportDateTo" placeholder="{{ 'to' | translate }}" is-open="openedTo" close-text="{{'close' | translate}}" />
......@@ -37,97 +56,121 @@
</span>
</p>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<p class="input-group">
<button type="button" class="btn btn-default" ng-click="filter()">{{'filter' | translate}}</i></button>
</p>
</div>
<div class="col-xs-1">
<div class="form-group">
<p class="input-group">
<button type="button" class="btn btn-default" ng-click="filter()">{{'filter' | translate}}</i></button>
</p>
</div>
</div>
</div>
<hr>
<div class="row" ng-if="showPrint" id="filter-info">
<div class="col-md-4">
<h3>{{printName | translate}}</h3>
</div>
<div class="col-md-8">
<h2><small>{{ 'tpl_date_frame' | translate:{'begin':reportDateSince, 'end':reportDateTo} }}</small></h2>
</div>
<!--/. selectors -->
</div>
<hr ng-if="showPrint">
<div class="row">
<div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'error_rate' | translate}}</small></h1>
<hr>
<canvas id="error_rate" class="chart chart-line" chart-options="optionsChartDateRate" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
</div>
<div class="col-lg-4">
<h1 class="text-center"><small>{{'average_time_per_try' | translate}}</small></h1>
<hr>
<canvas id="avg_time_trie" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas>
<!--/. filter selector -->
<!-- inform-content -->
<div id="inform-content">
<div class="row">
<div class="col-xs-12">
<h1 ng-if="!showPrint" class="page-header">{{'methods' | translate}}</h1>
<h1 ng-if="showPrint" class="page-header">{{printName | translate}} <small id="inform-content-date">{{ 'tpl_date_frame' | translate:{'begin':reportDateSince, 'end':reportDateTo} }}</small></h1>
</div>
</div>
<div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1>
<hr>
<canvas id="avg_time_pictos" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
<!-- graphics headers -->
<div class="row">
<div class="col-xs-4">
<h1 class="text-center"><small>{{'error_rate' | translate}}</small></h1>
</div>
<div class="col-xs-4">
<h1 class="text-center"><small>{{'average_time_per_try' | translate}}</small></h1>
</div>
<div class="col-xs-4">
<h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-bordered">
<tbody>
<tr>
<td>&nbsp;</td>
<td>{{ 'totals' | translate }}</td>
<td>{{ 'state_correct' | translate }}</td>
<td>{{ 'state_supervised' | translate }}</td>
<td>{{ 'state_spontaneous' | translate }}</td>
<td>{{ 'state_fail' | translate }}</td>
<td>{{ 'state_discarded' | translate }}</td>
<td>{{ 'state_demonstration' | translate }}</td>
<td>{{ 'state_broken' | translate }}</td>
</tr>
<tr>
<td>{{ 'tries' | translate }}</td>
<td>{{ tries_count.total }}</td>
<td>{{ tries_count.success }}</td>
<td>{{ tries_count.supervised_success }}</td>
<td>{{ tries_count.spontaneous_success }}</td>
<td>{{ tries_count.fail }}</td>
<td>{{ tries_count.discarded }}</td>
<td>{{ tries_count.model }}</td>
<td>{{ tries_count.broken }}</td>
</tr>
</tbody>
</table>
<!-- graphics -->
<div class="row">
<div class="col-xs-4 bg-light-gray">
<canvas id="error_rate" class="chart chart-line" chart-options="optionsChartDateRate" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
</div>
<div class="col-xs-4">
<canvas id="avg_time_trie" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas>
</div>
<div class="col-xs-4 bg-light-gray">
<canvas id="avg_time_pictos" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<h1>{{'vocabulary' | translate}}</h1>
<br>
<!-- table -->
<div class="row">
<div class="col-xs-12">
<table class="table table-bordered">
<thead>
<tr>
<th>&nbsp;</td>
<th>{{ 'totals' | translate }}</th>
<th><span class="glyphicon glyphicon-ok color_green" aria-hidden="true"></span> {{ 'state_correct' | translate }}</th>
<th><span class="glyphicon glyphicon-ok-circle color_blue" aria-hidden="true"></span> {{ 'state_supervised' | translate }}</th>
<th><span class="glyphicon glyphicon-user color_blue" aria-hidden="true"></span> {{ 'state_spontaneous' | translate }}</th>
<th><span class="glyphicon glyphicon-remove color_red" aria-hidden="true"></span> {{ 'state_fail' | translate }}</th>
<th><span class="glyphicon glyphicon-trash color_red" aria-hidden="true"></span> {{ 'state_discarded' | translate }}</th>
<th><span class="glyphicon glyphicon-edit color_orange" aria-hidden="true"></span> {{ 'state_demonstration' | translate }}</th>
<th><span class="glyphicon glyphicon-flash color_black" aria-hidden="true"></span> {{ 'state_broken' | translate }}</th>
<th><span class="glyphicon glyphicon-question-sign color_blue" aria-hidden="true"></span> {{ 'state_not_evaluated' | translate }}</th>
</tr>
</thead>
<tbody>
<tr>
<td><b>{{ 'tries' | translate }}</b></td>
<td>{{ tries_count.total }}</td>
<td>{{ tries_count.success }}</td>
<td>{{ tries_count.supervised_success }}</td>
<td>{{ tries_count.spontaneous_success }}</td>
<td>{{ tries_count.fail }}</td>
<td>{{ tries_count.discarded }}</td>
<td>{{ tries_count.model }}</td>
<td>{{ tries_count.broken }}</td>
<td>{{ tries_count.null }}</td>
</tr>
</tbody>
</table>
</div>
</div>
<hr>
<div class="row">
<div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'vocabulary_size' | translate}}</small></h1>
<hr>
<canvas id="vocab_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart4" chart-labels="labels4" chart-series="series4"></canvas>
</div>
<div class="col-lg-4">
<h1 class="text-center"><small>{{'phrase_size' | translate}}</small></h1>
<hr>
<canvas id="phrase_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart5" chart-labels="labels5" chart-series="series5"></canvas>
<!-- graphics headers 2 -->
<div class="row">
<div class="col-xs-4 bg-light-gray">
<h1 class="text-center"><small>{{'vocabulary_size' | translate}}</small></h1>
</div>
<div class="col-xs-4">
<h1 class="text-center"><small>{{'phrase_size' | translate}}</small></h1>
</div>
<div class="col-xs-4">
<h1 class="text-center"><small>{{'phrase_build_time' | translate}}</small></h1>
</div>
</div>
<div class="col-lg-4">
<h1 class="text-center"><small>{{'phrase_build_time' | translate}}</small></h1>
<hr>
<canvas id="phrases_time" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart6" chart-labels="labels6" chart-series="series6"></canvas>
<!-- graphics 2 -->
<div class="row">
<div class="col-xs-4 bg-light-gray">
<canvas id="vocab_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart4" chart-labels="labels4" chart-series="series4"></canvas>
</div>
<div class="col-xs-4">
<canvas id="phrase_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart5" chart-labels="labels5" chart-series="series5"></canvas>
</div>
<div class="col-xs-4">
<canvas id="phrases_time" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart6" chart-labels="labels6" chart-series="series6"></canvas>
</div>
</div>
</div>
<!--/. inform-content -->
</div>
<!-- END .panel-body -->
</div>
......
sails/src/assets/styles/main.css
......@@ -965,19 +965,19 @@ input[type=range]:focus::-ms-fill-upper {
}
.numberCircle {
border-radius: 50%;
behavior: url(PIE.htc); /* remove if you don't care about IE8 */
border-radius: 50%;
behavior: url(PIE.htc); /* remove if you don't care about IE8 */
width: 36px;
height: 36px;
padding: 8px;
width: 36px;
height: 36px;
padding: 8px;
background: #fff;
border: 2px solid #3071a9;
color: #3071a9;
text-align: center;
background: #fff;
border: 2px solid #3071a9;
color: #3071a9;
text-align: center;
font: 32px Arial, sans-serif;
font: 32px Arial, sans-serif;
}
/*
......@@ -995,10 +995,10 @@ input[type=range]:focus::-ms-fill-upper {
ng-file-upload and ngImgCrop
*/
.cropArea {
background: #E4E4E4;
overflow: hidden;
width:500px;
height:350px;
background: #E4E4E4;
overflow: hidden;
width:500px;
height:350px;
}
form .progress {
line-height: 15px;
......@@ -1025,9 +1025,27 @@ form .progress {
}
.header-image {
width: 100%;
background-color: #f8f8f8;
padding-top: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #e7e7e7;
width: 100%;
background-color: #f8f8f8;
padding-top: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #e7e7e7;
}
@media print {
#reportsTitle{
display: inherit;
}
#filter{
display: none;
}
#filter-info{
display: none;
}
#inform-content-date{
display: none;
}
.languages{
display: none;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment