Skip to content

yotta / pictogram

Go to a project
Commit df02e9e2 by Arturo Montejo Ráez
Options

images and button in student add modified

parent 2ff19d74
Inline Side-by-side
Showing with 26 additions and 28 deletions
android/Pictogram/tabletlibrary/tabletlibrary.iml
...@@ -76,22 +76,16 @@ ...@@ -76,22 +76,16 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
...@@ -100,7 +94,6 @@ ...@@ -100,7 +94,6 @@
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" /> <orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" /> <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
<orderEntry type="library" exported="" name="androidasync-2.1.9" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
<orderEntry type="library" exported="" name="android-gif-drawable-1.1.7" level="project" /> <orderEntry type="library" exported="" name="android-gif-drawable-1.1.7" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
...@@ -116,12 +109,12 @@ ...@@ -116,12 +109,12 @@
<orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" /> <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
<orderEntry type="library" exported="" name="androidasync-2.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-auth-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-auth-9.2.1" level="project" />
<orderEntry type="library" exported="" name="ion-2.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
<orderEntry type="library" exported="" name="ion-2.1.9" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
<orderEntry type="module" module-name="commonlibrary" exported="" /> <orderEntry type="module" module-name="commonlibrary" exported="" />
<orderEntry type="library" exported="" name="android-android-24" level="project" />
<orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" /> <orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
<orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" /> <orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" /> <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
......
sails/src/assets/scripts/modules/supervisor/controllers/students.js
...@@ -15,6 +15,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl( ...@@ -15,6 +15,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
ngToast, ngToast,
$timeout, $timeout,
IOService) { IOService) {
$scope.formdatastudent = { $scope.formdatastudent = {
username: '', username: '',
password: '', password: '',
...@@ -32,6 +33,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl( ...@@ -32,6 +33,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
state: 'accounts', state: 'accounts',
prev: 'accounts', prev: 'accounts',
back: false, back: false,
show: false,
rightTo: function (state) { rightTo: function (state) {
$scope.slide.back = false; $scope.slide.back = false;
...@@ -92,9 +94,6 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl( ...@@ -92,9 +94,6 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
current_instruction: 'no_instruction', current_instruction: 'no_instruction',
license_number: '' license_number: ''
}; };
// Hide the form
$scope.hidestudentadd = true;
}; };
/** /**
...@@ -127,7 +126,6 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl( ...@@ -127,7 +126,6 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
$scope.students.push(data); $scope.students.push(data);
$scope.resetForm(); $scope.resetForm();
$scope.hidestudentadd = true;
}) })
.error(function (err) { .error(function (err) {
var errorMessage = 'student_not_added'; var errorMessage = 'student_not_added';
......
sails/src/assets/scripts/modules/supervisor/views/students.html
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
<div class="panel-body"> <div class="panel-body">
<!-- Add Student Form --> <!-- Add Student Form -->
<div ng-include="'modules/supervisor/views/students_add.html'" ng-init="hidestudentadd = true" ng-hide="hidestudentadd"></div> <div ng-include="'modules/supervisor/views/students_add.html'" ng-show="slide.show"></div>
<!-- Add Student button and Search row --> <!-- Add Student button and Search row -->
<div class="row"> <div class="row">
<div class="col-xs-3"> <div class="col-xs-3">
<p class="text-left" ng-hide="!user.isSupAdmin || !hidestudentadd"> {{ showadd }}
<a ng-click="resetForm(); hidestudentadd = false" class="btn btn-success btn-sm" role="button"> <p class="text-left" ng-show="!slide.show">
<a ng-click="resetForm(); slide.show = true" class="btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_student' | translate }} <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_student' | translate }}
</a> </a>
</p> </p>
......
sails/src/assets/scripts/modules/supervisor/views/students_add.html
<form name="AddStudentForm" role="form" ng-submit="add_student()" ng-controller="StudentAddCtrl"> <div class="row">
<div class="col-xs-3">
<p class="text-left" ng-show="slide.show">
<a ng-click="slide.show = false" class="btn btn-default btm-sm" role="button">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span> {{ 'close' | translate }}
</a>
</p>
</div>
</div>
<form name="AddStudentForm" role="form" ng-submit="add_student()" ng-controller="StudentAddCtrl">
<div class="switch-panel-body" ng-switch="slide.state"> <div class="switch-panel-body" ng-switch="slide.state">
...@@ -11,7 +20,7 @@ ...@@ -11,7 +20,7 @@
<div class="col-md-4"> <div class="col-md-4">
<legend translate>Asociar cuenta existente</legend> <legend translate>Asociar cuenta existente</legend>
<div class="text-center"> <div class="text-center">
<a ng-click="slide.rightTo('existing')"><img src="img/child-existing.jpg" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" /></a> <a ng-click="slide.rightTo('existing')"><img src="img/child-existing.png" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" /></a>
</div> </div>
<div> <div>
<p>Asocie a su perfil la cuenta de un/a alumno/a ya registrado/a para poder gestionarla.</p> <p>Asocie a su perfil la cuenta de un/a alumno/a ya registrado/a para poder gestionarla.</p>
...@@ -20,7 +29,7 @@ ...@@ -20,7 +29,7 @@
<div class="col-md-4"> <div class="col-md-4">
<legend translate>Nueva cuenta oficial</legend> <legend translate>Nueva cuenta oficial</legend>
<div class="text-center"> <div class="text-center">
<a ng-click="slide.rightTo('new')"><img src="img/child-new.jpg" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" /></a> <a ng-click="slide.rightTo('new')"><img src="img/child-new.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" /></a>
</div> </div>
<div> <div>
<p>Alta de una nueva cuenta de alumno/a con licencia oficial.</p> <p>Alta de una nueva cuenta de alumno/a con licencia oficial.</p>
...@@ -29,7 +38,7 @@ ...@@ -29,7 +38,7 @@
<div class="col-md-4"> <div class="col-md-4">
<legend translate>Crear cuenta de prueba</legend> <legend translate>Crear cuenta de prueba</legend>
<div class="text-center"> <div class="text-center">
<a ng-click="slide.rightTo('test')"><img src="img/child-test.jpg" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" /></a> <a ng-click="slide.rightTo('test')"><img src="img/child-test.png" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" /></a>
</div> </div>
<div> <div>
<p>Cree una cuenta temporal para probar gratuitamente Pictogram. Puede activar una licencia en esta cuenta para mantenerla más allá de los tres meses de prueba.</p> <p>Cree una cuenta temporal para probar gratuitamente Pictogram. Puede activar una licencia en esta cuenta para mantenerla más allá de los tres meses de prueba.</p>
...@@ -45,7 +54,7 @@ ...@@ -45,7 +54,7 @@
<legend translate>Asociar cuenta de alumno/a</legend> <legend translate>Asociar cuenta de alumno/a</legend>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-2 text-center"> <div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-existing.jpg" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" /> <img src="img/child-existing.png" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" />
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<input class="form-control" type="text" id="student_license" mask="wwww-wwww-wwww-wwww" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required> <input class="form-control" type="text" id="student_license" mask="wwww-wwww-wwww-wwww" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
...@@ -69,7 +78,7 @@ ...@@ -69,7 +78,7 @@
<legend translate>Crear nueva cuenta oficial</legend> <legend translate>Crear nueva cuenta oficial</legend>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-2 text-center"> <div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-new.jpg" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" /> <img src="img/child-new.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" />
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
...@@ -103,7 +112,7 @@ ...@@ -103,7 +112,7 @@
<legend translate>Crear cuenta de prueba</legend> <legend translate>Crear cuenta de prueba</legend>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-2 text-center"> <div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-test.jpg" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" /> <img src="img/child-test.png" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" />
</div> </div>
<div class="form-group col-md-4" id="office_form"> <div class="form-group col-md-4" id="office_form">
<div class="form-group"> <div class="form-group">
...@@ -134,16 +143,13 @@ ...@@ -134,16 +143,13 @@
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="confirmation"> <div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="confirmation">
<h2>{{ 'user_created' | translate }} </h2> <h2>{{ 'user_created' | translate }} </h2>
<p> La nueva cuenta ya está disponible en su lista de alumnos.</p> <p> La nueva cuenta ya está disponible en su lista de alumnos.dev</p>
<br> <br>
<img src="img/child.jpg"/> <img src="img/child.png"/>
</div> </div>
</div> </div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-click="resetForm(); hidestudentadd = true">{{'cancel'|translate}}</button>
</div>
</form> </form>
......
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