Skip to content

yotta / pictogram

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

new signups ready and working

parent 9b72eb59
Inline Side-by-side
Showing with 82 additions and 61 deletions
sails/src/api/controllers/SupervisorController.js
......@@ -266,6 +266,8 @@ module.exports = {
return res.badRequest("Invalid params");
var supData = {
role: params.role,
name: typeof params.name == 'undefined' ? '' : params.name,
password: params.password,
email: params.email,
pic: sails.config.pictogram.paths.defaultAvatarFileName,
......
sails/src/assets/scripts/controllers/main.js
......@@ -75,7 +75,7 @@ dashboardControllers.controller('MainCtrl', function MainCtrl($scope, $window, $
// Returns the full name of the user
$scope.user.getFullName = function(){
return $scope.user.name + " " + $scope.user.surname;
return $scope.user.name + ($scope.user.isOffice ? "" : " " + $scope.user.surname);
};
// Logout
......
sails/src/assets/scripts/modules/login/views/login.html
......@@ -239,7 +239,7 @@
<button class="btn btn-default" ng-click="slide.leftTo('accounts')">&lt;&lt; {{ 'back' | translate }} </button>
</div>
<div class="col-md-4">
<button type="submit" class="btn btn-primary" ng-disabled="forms.therapistForm.$invalid || !formdata.disclaimer_accepted" ng-click="slide.rightTo('confirmation')">{{ 'create_account' | translate }} &gt;&gt; </button>
<button type="submit" class="btn btn-primary" ng-disabled="forms.therapistForm.$invalid || !formdata.disclaimer_accepted">{{ 'create_account' | translate }} &gt;&gt; </button>
</div>
</div>
</div>
......@@ -261,11 +261,11 @@
<div class="form-group col-md-4" id="office_form">
<div class="form-group">
<label translate>name</label>
<input type="text" class="form-control" placeholder="{{ 'name' | translate }}" required ng-model="formdata.name"/>
<input type="text" class="form-control" placeholder="{{ 'name' | translate }}" name="name" required ng-model="formdata.name"/>
</div>
<div class="form-group">
<label translate>email</label>
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" required ng-model="formdata.email"/>
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" name="email" required ng-model="formdata.email"/>
<span class="color_red text_sm pull-right" ng-show="forms.officeForm.email.$dirty && forms.officeForm.email.$invalid" translate>email_invalid</span>
</div>
<fieldset>
......@@ -294,7 +294,7 @@
<button class="btn btn-default" ng-click="slide.leftTo('accounts')">&lt;&lt; {{ 'back' | translate }} </button>
</div>
<div class="col-md-4">
<button type="submit" class="btn btn-primary" ng-disabled="forms.officeForm.$invalid" ng-click="slide.rightTo('confirmation')">{{ 'create_account' | translate }} &gt;&gt; </button>
<button type="submit" class="btn btn-primary" ng-disabled="forms.officeForm.$invalid">{{ 'create_account' | translate }} &gt;&gt; </button>
</div>
</div>
</div>
......
sails/src/assets/scripts/modules/supervisor/controllers/setup.js
......@@ -134,6 +134,9 @@ dashboardControllers.controller('SetupCtrl', function SetupCtrl(
$window.sessionStorage.user = JSON.stringify(user);
$location.path("/students");
//$scope.$apply();
})
.error(function () {
ngToast.danger({ content: $translate.instant('data_no_saved') });
......
sails/src/assets/scripts/modules/supervisor/views/header.html
......@@ -17,6 +17,7 @@
<div class="dropdown">
<div class="topbar__supervisor__name">
<div class="topbar__supervisor__name__fullname">{{user.getFullName()}}</div>
<div class="topbar__supervisor__name__role ng-binding">{{ user.role | translate }}</div>
</div>
<div
class="topbar__supervisor__avatar thumbnail"
......
sails/src/assets/scripts/modules/supervisor/views/setup.html
......@@ -3,73 +3,86 @@
<div class="page-header">
<h2 translate>setup</h2>
</div>
<div id="signin">
<div>
<!-- Logo Pictogram -->
<!-- Formulario -->
<form name="setupForm" enctype="multipart/form-data" role="form" ng-submit="setup()">
<!-- Preview -->
<img class="thumbnail preview" ng-src="{{user.pic}}" />
<!-- Fin Cambiar imagen de perfil -->
<div class="form-group">
<!-- input type="file" ng-file-select="onFileSelect($files)" accept="image/*"></input -->
<button class="btn btn-default" ngf-select ng-model="picFile" accept="image/*" ngf-change="changeImg()">
<span class="glyphicon glyphicon-folder-open"></span> {{ 'change_picture' | translate }}
</button>
</div>
<fieldset>
<legend translate>personal_data</legend>
<div class="form-group">
<input type="text" class="form-control" id="signin_name" placeholder="{{ 'name' | translate }}" required ng-model="formdata.name" />
</div>
<div class="form-group">
<input type="text" class="form-control" id="signin_surname" placeholder="{{ 'surname' | translate }}" required ng-model="formdata.surname" />
</div>
<div class="form-group">
<input type="text" class="form-control" id="signin_address" placeholder="{{ 'address' | translate }}" ng-model="formdata.address" />
</div>
<div class="row">
<div class="col-md-3 col-md-offset-1">
<!-- Preview -->
<img class="thumbnail preview" ng-src="{{user.pic}}" />
<!-- Fin Cambiar imagen de perfil -->
<div class="form-group">
<input type="text" class="form-control" id="signin_phone" placeholder="{{ 'phone' | translate }}" ng-model="formdata.phone" />
<!-- input type="file" ng-file-select="onFileSelect($files)" accept="image/*"></input -->
<button class="btn btn-default" ngf-select ng-model="picFile" accept="image/*" ngf-change="changeImg()">
<span class="glyphicon glyphicon-folder-open"></span> {{ 'change_picture' | translate }}
</button>
</div>
</fieldset>
</div>
<div class="col-md-4">
<fieldset>
<legend translate>personal_data</legend>
<div class="form-group">
<input type="text" class="form-control" id="signin_name" placeholder="{{ 'name' | translate }}" required ng-model="formdata.name" />
</div>
<div class="form-group" ng-if="!user.isOffice">
<input type="text" class="form-control" id="signin_surname" placeholder="{{ 'surname' | translate }}" required ng-model="formdata.surname" />
</div>
<div class="form-group">
<input type="text" class="form-control" id="signin_address" placeholder="{{ 'address' | translate }}" ng-model="formdata.address" />
</div>
<div class="form-group">
<input type="text" class="form-control" id="signin_phone" placeholder="{{ 'phone' | translate }}" ng-model="formdata.phone" />
</div>
</fieldset>
<fieldset>
<legend translate>email</legend>
<div class="form-group">
<input type="email" class="form-control" id="signin_email1" placeholder="{{ 'email' | translate }}" required ng-model="formdata.email" />
</div>
</fieldset>
<fieldset>
<legend translate>language</legend>
<div class="form-group">
<select class="form-control" name="signin_language" id="signin_language" ng-model="formdata.lang">
<option value="es-es">Español</option>
<option value="en-gb">English</option>
</select>
</div>
</fieldset>
<fieldset>
<legend translate>change_password</legend>
<div class="form-group">
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formdata.password" />
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formdata.password_confirm" />
</div>
<fieldset>
</div>
<fieldset>
<legend translate>language</legend>
<div class="form-group">
<select class="form-control" name="signin_language" id="signin_language" ng-model="formdata.lang">
<option value="es-es">Español</option>
<option value="en-gb">English</option>
</select>
</div>
</fieldset>
<div class="col-md-4">
<p class="text-center">
<button type="submit" class="btn btn-primary" translate>save</button>
</p>
</form>
<fieldset>
<legend translate>email</legend>
<div class="form-group">
<input type="email" class="form-control" id="signin_email1" placeholder="{{ 'email' | translate }}" required ng-model="formdata.email" />
</div>
</fieldset>
<fieldset>
<legend translate>change_password</legend>
<div class="form-group">
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formdata.password" />
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formdata.password_confirm" />
</div>
<fieldset>
</div>
</div>
<!-- Fin signin -->
<div class="row">
<p class="text-right">
<button type="submit" class="btn btn-primary" translate>save</button>
</p>
</div>
</form>
</div>
<!-- Fin signin -->
<!-- DIV Modal cropper para recorte de imagen -->
<div class="modal fade" id="bootstrap-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
......
sails/src/assets/styles/topbar.less
......@@ -29,11 +29,13 @@
padding: 0.5em;
&__fullname,
&__office {
&__office,
&__role {
text-align: right;
}
&__office {
&__office,
&__role {
opacity: 0.75;
}
}
......
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