Skip to content

yotta / pictogram

Go to a project
Commit c1ed8c7e by Fernando Martínez Santiago
Options

Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

parents cd1f26ba 3f57f07f
Expand all
Inline Side-by-side
Showing with 123 additions and 127 deletions
.gitignore
......@@ -11,6 +11,8 @@ mocha-report.xml
##########
sails/upload
sails/symbolstx*
sails/arasaac*
sails/arasaac
sails/src/assets/symbolstx*
sails/src/assets/upload
sails/upload.tgz
......
sails/roles/database/files/pictocat.sql deleted 100644 → 0
-- MySQL dump 10.13 Distrib 5.7.13, for Linux (x86_64)
--
-- Host: localhost Database: pictodbclean
-- ------------------------------------------------------
-- Server version 5.7.13
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `pictocat`
--
DROP TABLE IF EXISTS `pictocat`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pictocat` (
`id` int(11) NOT NULL,
`id_supercat` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Identifies a category, which, itself, may belong to another category';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `pictocat`
--
LOCK TABLES `pictocat` WRITE;
/*!40000 ALTER TABLE `pictocat` DISABLE KEYS */;
INSERT INTO `pictocat` VALUES (1,0),(2,1),(3,1),(4,0),(5,0),(6,1),(7,0),(8,1),(9,0),(10,0),(11,0),(12,0),(13,0),(14,0),(15,0),(16,0),(17,16),(18,16),(19,0),(20,0),(21,16),(22,0),(23,22),(24,16),(25,16),(26,0),(27,0),(28,0),(29,0),(30,29),(31,29),(32,29),(33,0),(34,0),(35,22),(36,0),(37,5),(38,0),(39,0),(40,12),(41,15),(42,0),(43,0),(44,0),(45,9),(46,0),(47,0),(48,0),(49,0),(50,0),(51,0),(52,0),(53,0),(54,53),(55,53),(56,53),(57,53),(58,53),(59,53),(60,53),(61,53),(62,53),(63,53),(64,53),(65,51),(66,20),(67,0),(68,0),(69,0),(70,0),(71,0),(72,20),(73,0),(74,0),(75,0),(76,71),(77,20),(78,51),(79,0),(80,0),(81,5),(82,22),(83,0),(84,0),(85,84),(86,84),(87,51),(88,0),(89,20),(90,0),(91,51),(92,80),(93,0),(94,0),(95,0),(96,0),(97,0),(98,97),(99,97),(100,80),(101,69),(102,51),(103,51),(104,0),(105,51),(106,69),(107,69),(108,0),(109,69),(110,69),(111,69),(112,69),(113,69),(114,0),(115,71),(116,0),(117,0),(118,0),(119,0),(120,0),(121,0),(122,0);
/*!40000 ALTER TABLE `pictocat` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2017-01-17 9:48:07
--
-- Creacion y volcado de datos para la tabla `pictocattree`
--
source /vagrant/roles/database/files/pictocat_tree_populate.sql
source /vagrant/roles/database/files/catexp.sql
sails/roles/database/files/pictodb-schema.sql
......@@ -48,17 +48,14 @@ COMMENT="This table registers and action performed by a user at a given time, al
--
-- Estructura de tabla para la tabla `catexp`
--
CREATE TABLE IF NOT EXISTS `catexp`(
CREATE TABLE `catexp` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`id_cat` int(11) NOT NULL,
`lang` char(5),
`lang` char(5) DEFAULT NULL,
`exp` varchar(30) NOT NULL,
PRIMARY KEY(`id`),
UNIQUE(exp,lang),
CHECK (lang IN ('es-es','en-gb','en-us'))
)
COMMENT="Stores the expressions available in several languages for a given category (id_cat)";
PRIMARY KEY (`id`),
UNIQUE KEY `exp` (`exp`,`lang`)
) ENGINE=InnoDB AUTO_INCREMENT=27958 DEFAULT CHARSET=urf8 COMMENT='Stores the expressions available in several languages for a given category (id_cat)';
-- --------------------------------------------------------
--
......@@ -201,9 +198,9 @@ COMMENT="Stablish access rights to pictos";
CREATE TABLE IF NOT EXISTS `pictocat`(
`id` int(11) PRIMARY KEY,
`id_supercat` int(11)
`id_supercat` int(11) DEFAULT NULL
)
COMMENT="Identifies a category, which, itself, may belong to another category";
ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT="Identifies a category, which, itself, may belong to another category";
-- --------------------------------------------------------
......
sails/roles/database/tasks/main.yml
......@@ -24,14 +24,6 @@
state: import
target: "{{ server_path }}/{{ database_files_relative_path }}/symbolstix.sql"
- name: Imports symbolstix categories
mysql_db:
login_user: "{{ database_user }}"
login_password: "{{ database_user_passwd }}"
name: "{{ database_name }}"
state: import
target: "{{ server_path }}/{{ database_files_relative_path }}/pictocat.sql"
- name: Imports application essential data
mysql_db:
login_user: "{{ database_user }}"
......
sails/src/assets/app/i18n/en-gb.json
......@@ -256,6 +256,7 @@
"password_type": "Password",
"pause": "Pause",
"pause_session": "Pause session",
"percent": "Percent",
"personal_data": "Personal data",
"personal_data": "Personal data",
"phone": "Phone number",
......
sails/src/assets/app/i18n/es-es.json
......@@ -255,6 +255,7 @@
"password_short": "La contraseña es muy corta, debe tener al menos una longitud de {{minlength}} caracteres",
"pause": "Pausar",
"pause_session": "Pausar sesión",
"percent": "Porcentaje",
"personal_data": "Datos personales",
"personal_data": "Datos personales",
"phone": "Teléfono",
......
sails/src/assets/scripts/modules/student/controllers/reports.js
......@@ -205,8 +205,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
//CHART DATA
//*** Error rate chart***
$scope.labels1 = $scope.method_chart_dates[0];
$scope.series1 = ['Tasa de error'];
//$scope.dataChart1 = [error_rate];
$scope.series1 = [$translate.instant('error_rate')];
$scope.dataChart1 = $scope.error_rate_rate;
$scope.optionsChartDateRate = {
elements:{
......@@ -219,7 +218,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
scales: {
yAxes: [{
scaleLabel: {
labelString: "Porcentaje",
labelString: $translate.instant('percent'),
display: true
}
}],
......@@ -341,7 +340,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
//*** Vocabuary size chart***
$scope.labels4 = $scope.method_chart_dates[0];
$scope.series4 = [$translate.instant('Pictograms')];
$scope.series4 = [$translate.instant('pictograms')];
$scope.dataChart4 = $scope.vocab_size;
//*** Phrase size chart***
......
sails/src/assets/scripts/modules/student/views/reports.html
<!-- Reports tab-->
<div class="panel panel-default student_tab_panel">
<div class="panel-body">
<!-- reports title -->
<div id="reportsTitle" hidden>
<br>
<div class="row">
<div class="col-md-4">
<h1>{{'methods' | translate}}</h1>
<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>
<!-- filter selector -->
<div id="filter">
<div class="row">
<div class="col-xs-12">
<h1 class="page-header">{{'filter' | translate}}</h1>
</div>
<div class="row" id="filter">
<div class="col-md-3">
</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">
......@@ -18,7 +37,7 @@
</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}}" />
......@@ -28,7 +47,7 @@
</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="reportDateTo" placeholder="{{ 'to' | translate }}" is-open="openedTo" close-text="{{'close' | translate}}" />
......@@ -37,61 +56,78 @@
</span>
</p>
</div>
</div>
<div class="col-md-3">
<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>
<!--/. selectors -->
</div>
<div class="col-md-8">
<h2><small>{{ 'tpl_date_frame' | translate:{'begin':reportDateSince, 'end':reportDateTo} }}</small></h2>
<!--/. 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>
<hr ng-if="showPrint">
<!-- graphics headers -->
<div class="row">
<div class="col-lg-4 bg-light-gray">
<div class="col-xs-4">
<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">
<div class="col-xs-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>
</div>
<div class="col-lg-4 bg-light-gray">
<div class="col-xs-4">
<h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1>
<hr>
</div>
</div>
<!-- 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>
<br>
<!-- table -->
<div class="row">
<div class="col-lg-12">
<div class="col-xs-12">
<table class="table table-bordered">
<tbody>
<thead>
<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>
<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>{{ 'tries' | translate }}</td>
<td><b>{{ 'tries' | translate }}</b></td>
<td>{{ tries_count.total }}</td>
<td>{{ tries_count.success }}</td>
<td>{{ tries_count.supervised_success }}</td>
......@@ -100,34 +136,41 @@
<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>
<!-- graphics headers 2 -->
<div class="row">
<div class="col-md-4">
<h1>{{'vocabulary' | translate}}</h1>
<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>
<hr>
<div class="col-xs-4">
<h1 class="text-center"><small>{{'phrase_build_time' | translate}}</small></h1>
</div>
</div>
<!-- graphics 2 -->
<div class="row">
<div class="col-lg-4 bg-light-gray">
<h1 class="text-center"><small>{{'vocabulary_size' | translate}}</small></h1>
<hr>
<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-lg-4">
<h1 class="text-center"><small>{{'phrase_size' | translate}}</small></h1>
<hr>
<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-lg-4">
<h1 class="text-center"><small>{{'phrase_build_time' | translate}}</small></h1>
<hr>
<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
......@@ -1031,3 +1031,21 @@ form .progress {
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