Skip to content

yotta / pictogram

Go to a project
Commit c1cb3d21 by Jose Antonio
Options

working on methods reports 

not finished
parent 9111b9b6
Inline Side-by-side
Showing with 36 additions and 67 deletions
sails/src/assets/scripts/modules/student/controllers/reports.js
This diff could not be displayed because it is too large.
sails/src/assets/scripts/modules/student/views/reports.html
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<p class="input-group"> <p class="input-group">
<select class="form-control" name="method_select" id="method_select" ng-model="selected_method.id" ng-change="load_method_data()"> <select class="form-control" name="method_select" id="method_select" ng-model="selected_method.id">
<option value="-1">{{'select_method' | translate}}</option> <option value="-1">{{'select_method' | translate}}</option>
<option ng-repeat="ma in methods track by $index" <option ng-repeat="ma in methods track by $index"
ng-value="ma.id" ng-value="ma.id"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<p class="input-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}}" /> <input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="reportDateSince" placeholder="{{ 'since' | translate }}" is-open="openedSince" close-text="{{'close' | translate}}" />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<p class="input-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}}" /> <input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="reportDateTo" placeholder="{{ 'to' | translate }}" is-open="openedTo" close-text="{{'close' | translate}}" />
...@@ -43,93 +43,62 @@ ...@@ -43,93 +43,62 @@
</div> </div>
</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>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-lg-4 bg-light-gray"> <div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'error_rate' | translate}}</small></h1> <h1 class="text-center"><small>{{'error_rate' | translate}}</small></h1>
<hr> <hr>
<canvas id="bar1" class="chart chart-line" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
<table class="table table-bordered">
<tbody>
<tr>
<td>{{'sessions' | translate}}</td>
<td>{{ ws_number }}</td>
</tr>
<tr>
<td>{{'time_sessions_total' | translate}}</td>
<td>{{ ws_time }}</td>
</tr>
<tr>
<td>{{'tries_done' | translate}}</td>
<td>{{ tries_number }}</td>
</tr>
<tr>
<td>{{'time_tries_total' | translate}}</td>
<td>{{ tries_time }}</td>
</tr>
</tbody>
</table>
<hr>
<canvas id="bar1" class="chart chart-bar" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
<h3>{{ dataChart1 }} {{ labels1 }}</h3> <h3>{{ dataChart1 }} {{ labels1 }}</h3>
<hr>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<h1 class="text-center"><small>{{'average_time_per_try' | translate}}</small></h1> <h1 class="text-center"><small>{{'average_time_per_try' | translate}}</small></h1>
<hr>
<table class="table table-bordered">
<tbody>
<tr>
<td>{{'sessions' | translate}}</td>
<td>{{ ws_number_year }}</td>
</tr>
<tr>
<td>{{'time_sessions_total' | translate}}</td>
<td>{{ ws_time_year }}</td>
</tr>
<tr>
<td>{{'tries_done' | translate}}</td>
<td>{{ tries_number_year }}</td>
</tr>
<tr>
<td>{{'time_tries_total' | translate}}</td>
<td>{{ tries_time_year }}</td>
</tr>
</tbody>
</table>
<hr> <hr>
<canvas id="bar2" class="chart chart-bar" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas> <canvas id="bar2" class="chart chart-bar" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas>
</div> </div>
<div class="col-lg-4 bg-light-gray"> <div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1> <h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1>
<hr> <hr>
<canvas id="bar3" class="chart chart-bar" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-bordered"> <table class="table table-bordered">
<tbody> <tbody>
<tr> <tr>
<td>{{'sessions' | translate}}</td> <td>&nbsp;</td>
<td>{{ ws_number_month }}</td> <td>{{ 'total' | translate }}</td>
<td>{{ 'success' | translate }}</td>
<td>{{ 'supervised_success' | translate }}</td>
<td>{{ 'spontaneous_success' | translate }}</td>
<td>{{ 'fail' | translate }}</td>
<td>{{ 'discarded' | translate }}</td>
<td>{{ 'model' | translate }}</td>
<td>{{ 'broken' | translate }}</td>
</tr> </tr>
<tr> <tr>
<td>{{'time_sessions_total' | translate}}</td> <td>{{ 'tries' | translate }}</td>
<td>{{ ws_time_month }}</td> <td>{{ tries_count.total }}</td>
</tr> <td>{{ tries_count.success }}</td>
<tr> <td>{{ tries_count.supervised_success }}</td>
<td>{{'tries_done' | translate}}</td> <td>{{ tries_count.spontaneous_success }}</td>
<td>{{ tries_number_month }}</td> <td>{{ tries_count.fail }}</td>
</tr> <td>{{ tries_count.discarded }}</td>
<tr> <td>{{ tries_count.model }}</td>
<td>{{'time_tries_total' | translate}}</td> <td>{{ tries_count.broken }}</td>
<td>{{ tries_time_month }}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<hr>
<canvas id="bar3" class="chart chart-bar" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
</div> </div>
</div> </div>
......
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