Skip to content
This repository was archived by the owner on Jun 18, 2019. It is now read-only.

Commit deb3e76

Browse files
hosoyamarcoshosoyamarcos
committed
fix(layout): altera layout univCertsys
Otimiza layout univCertsys #14
1 parent cf5eec6 commit deb3e76

File tree

2 files changed

+99
-70
lines changed

2 files changed

+99
-70
lines changed

‎Angular_Seed_Project/page/modais/modalUniversidade.html

+81-57
Original file line numberDiff line numberDiff line change
@@ -5,98 +5,122 @@ <h4 class="modal-title">Crie e Edite o curso desejado</h4>
55
<small class="font-bold">Universidade Certsys fortalece as bases acadêmicas e técnicas.</small>
66
</div>
77
<div class="modal-body">
8-
<form name="cursoForm" ng-submit="cursoForm.$validate && salvar()" class="form-horizontal">
8+
<form name="cursoForm" novalidate ng-submit="salvar(cursoForm.$valid)" class="form-horizontal">
99
<div class="col-sm-12 text-center"><h3>Dados Gerais do Curso</h3></div>
10-
<div class="form-group"><label class="col-sm-2 control-label">Título:</label>
11-
<div class="col-sm-10"><input type="text" ng-model="titulo" placeholder="Ferramenta e nível da aula..."
12-
class="form-control" required>
10+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.titulo.$invalid && !cursoForm.titulo.$pristine }"><label class="col-sm-2 control-label">Título:</label>
11+
<div class="col-sm-10">
12+
<input name="titulo" type="text" ng-model="titulo" placeholder="Ferramenta e nível da aula..."
13+
class="form-control" required/>
14+
<p ng-show="cursoForm.titulo.$invalid && !cursoForm.titulo.$pristine" class="help-block">Título necessário!</p>
1315
</div>
1416
</div>
1517

16-
<div class="form-group"><label class="col-sm-2 control-label">Descrição:</label>
17-
<div class="col-sm-10"><input type="text" ng-model="descricao" placeholder="Diretrizes gerais..." class="form-control" required>
18+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.descricao.$invalid && !cursoForm.descricao.$pristine }"><label class="col-sm-2 control-label">Descrição:</label>
19+
<div class="col-sm-10">
20+
<input name="descricao" type="text" ng-model="descricao" placeholder="Diretrizes gerais..." class="form-control" required>
21+
<p ng-show="cursoForm.descricao.$invalid && !cursoForm.descricao.$pristine" class="help-block">Descrição necessária!</p>
1822
</div>
1923
</div>
2024

21-
<div class="form-group"><label class="col-sm-2 control-label">Local:</label>
22-
<div class="col-sm-10"><input type="text" ng-model="local" placeholder="Defina o local do curso..." class="form-control" required>
25+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.local.$invalid && !cursoForm.local.$pristine }"><label class="col-sm-2 control-label">Local:</label>
26+
<div class="col-sm-10">
27+
<input name="local" type="text" ng-model="local" placeholder="Defina o local do curso..." class="form-control" required>
28+
<p ng-show="cursoForm.local.$invalid && !cursoForm.local.$pristine" class="help-block">Local necessário!</p>
2329
</div>
2430
</div>
2531

2632
<div class="hr-line-dashed"></div>
2733

28-
29-
<div class="form-group">
30-
<div class="col-sm-12 text-center"><h3>Limite de Incrições e Data do Curso</h3></div>
31-
32-
<label class="col-sm-2 control-label">Data:</label>
33-
<div class="col-sm-4 input-group-2 date">
34-
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
35-
<input id="data-inicio" watch-direct-changes="true" type="text" date-time="diaInicio" data-ng-model="diaInicio"
36-
format="DD/MM/YYYY" view="date" min-view="date" auto-close="true"
37-
class="ng-pristine ng-valid ng-scope ng-touched form-control" required>
38-
<!--<input type="text" class="form-control" data-ng-model="programado.checkOut" name="programado" date-time required min="{{ today | date: 'yyyy-MM-dd' }}" view="date" auto-close="true" min-view="date" format="DD/MM/YYYY">-->
34+
<div class="col-sm-12 col-lg-12 text-center"><h3>Limite de Incrição e Data do Curso</h3></div>
35+
36+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.limiteInscricao.$invalid && !cursoForm.limiteInscricao.$pristine }"><label class="col-sm-2 col-lg-2 control-label">Limite:</label>
37+
<div class="col-sm-10 col-lg-10 " >
38+
<div class="input-group-2 date">
39+
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
40+
<input name="limiteInscricao" id="data-limite-inscricao" type="text" date-time="" data-ng-model="dataLimiteInscricao"
41+
format="DD/MM/YYYY HH:mm" view="date" min-view="hours" auto-close="true"
42+
class="ng-pristine ng-valid ng-scope ng-touched form-control" required>
43+
</div>
44+
<p ng-show="cursoForm.limiteInscricao.$invalid && !cursoForm.limiteInscricao.$pristine" class="help-block">Data Limite necessária!</p>
3945
</div>
46+
</div>
4047

41-
<div class="col-sm-2 input-group-2 date">
42-
<input ng-model="horarioInicio" type="text" clock-picker class="form-control" required>
43-
<!--<input type="text" class="form-control" data-ng-model="programado.checkOut" name="programado" date-time required min="{{ today | date: 'yyyy-MM-dd' }}" view="date" auto-close="true" min-view="date" format="DD/MM/YYYY">-->
48+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.diaInicio.$invalid && !cursoForm.diaInicio.$pristine }">
49+
<label class="col-sm-2 col-lg-2 control-label">Data:</label>
50+
<div class="col-sm-10 col-lg-10" >
51+
<div class="input-group-2 date">
52+
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
53+
<input name="diaInicio" id="data-inicio" watch-direct-changes="true" type="text" date-time="diaInicio" data-ng-model="diaInicio"
54+
format="DD/MM/YYYY" view="date" min-view="date" auto-close="true"
55+
class="ng-pristine ng-valid ng-scope ng-touched form-control" required />
56+
</div>
57+
<p ng-show="cursoForm.diaInicio.$invalid && !cursoForm.diaInicio.$pristine" class="help-block">Data do Curso necessária!</p>
4458
</div>
59+
</div>
4560

46-
<label class="col-sm-2 control-label"> às </label>
47-
48-
<div class="col-sm-2 input-group-2 date">
49-
<input ng-model="horarioFim" type="text" clock-picker
50-
class="form-control" required>
51-
<!--<input type="text" class="form-control" data-ng-model="programado.checkOut" name="programado" date-time required min="{{ today | date: 'yyyy-MM-dd' }}" view="date" auto-close="true" min-view="date" format="DD/MM/YYYY">-->
61+
<div class="form-group">
62+
<label class="col-sm-2 control-label">Horário:</label>
63+
64+
<div ng-class="{ 'has-error' : cursoForm.horaInicio.$invalid && !cursoForm.horaInicio.$pristine }">
65+
<label class="col-sm-1 control-label"> Início </label>
66+
<div class="col-sm-4">
67+
<div class="input-group-2 date">
68+
<span class="input-group-addon"><i class="fa fa-clock-o" aria-hidden="true"></i></span>
69+
<input name="horaInicio" ng-model="horarioInicio" type="text" clock-picker class="form-control" required />
70+
</div>
71+
<p ng-show="cursoForm.horaInicio.$invalid && !cursoForm.horaInicio.$pristine" class="help-block">Horário de início necessário!</p>
72+
</div>
5273
</div>
5374

54-
</div>
55-
<div class="form-group"><label class="col-sm-2 control-label">Limite:</label>
56-
<div class="col-sm-10 input-group-2 date">
57-
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
58-
<input id="data-limite-inscricao" type="text" date-time="" data-ng-model="dataLimiteInscricao"
59-
format="DD/MM/YYYY HH:mm" view="date" min-view="hours" auto-close="true"
60-
class="ng-pristine ng-valid ng-scope ng-touched form-control" required>
61-
<!--<input type="text" class="form-control" data-ng-model="programado.checkOut" name="programado" date-time required min="{{ today | date: 'yyyy-MM-dd' }}" view="date" auto-close="true" min-view="date" format="DD/MM/YYYY">-->
75+
<div ng-class="{ 'has-error' : cursoForm.horaFim.$invalid && !cursoForm.horaFim.$pristine }">
76+
<label class="col-sm-1 control-label"> Fim </label>
77+
<div class="col-sm-4">
78+
<div class="input-group-2 date">
79+
<span class="input-group-addon"><i class="fa fa-clock-o" aria-hidden="true"></i></span>
80+
<input name="horaFim" ng-model="horarioFim" type="text" clock-picker class="form-control" required />
81+
</div>
82+
<p ng-show="cursoForm.horaFim.$invalid && !cursoForm.horaFim.$pristine" class="help-block">Horário de fim necessário!</p>
83+
</div>
6284
</div>
6385
</div>
6486

6587
<div class="hr-line-dashed"></div>
88+
6689
<div class="col-sm-12 text-center"><h3>Mínimo e Máximo de Alunos</h3></div>
67-
<div class="form-group"><label class="col-sm-2 control-label">Mín:</label>
68-
<div class="col-sm-10">
69-
<h-number value="minInscritos" min="1" step="1"
70-
change="onChangeMinimo()"></h-number>
71-
</div>
7290

91+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.minInscritos.$invalid && !cursoForm.minInscritos.$pristine }"><label class="col-sm-2 control-label">Min:</label>
92+
<div class="col-sm-10" >
93+
<input name="minInscritos" type="number" min="1" class="form-control" ng-change="onChangeMinimo()" ng-model="minInscritos" required/>
94+
<p ng-show="cursoForm.minInscritos.$invalid && !cursoForm.minInscritos.$pristine" class="help-block">Minímo de inscritos necessário!</p>
95+
</div>
7396
</div>
74-
<div class="form-group"><label class="col-sm-2 control-label">Max:</label>
75-
<div class="col-sm-10">
76-
<h-number value="maxInscritos" min="1" step="1"
77-
change="onChangeMaximo()"></h-number>
97+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.maxInscritos.$invalid && !cursoForm.maxInscritos.$pristine }"><label class="col-sm-2 control-label">Max:</label>
98+
<div class="col-sm-10" >
99+
<input name="maxInscritos" type="number" min="1" class="form-control" ng-change="onChangeMaximo()" ng-model="maxInscritos" required/>
100+
<p ng-show="cursoForm.maxInscritos.$invalid && !cursoForm.maxInscritos.$pristine" class="help-block">Máximo de inscritos necessário!</p>
78101
</div>
79102
</div>
103+
80104
<div class="hr-line-dashed"></div>
81-
<div class="col-sm-12 text-center"><h3>Escolha Alguém</h3></div>
82-
<div class="form-group"><label class="col-sm-2 control-label">Instrutor:</label>
83-
<div class="col-sm-10">
84-
<input type="text" placeholder="Quem irá ministrar..." class="form-control" ng-model="selected"
105+
106+
<div class="col-sm-12 text-center"><h3>Instrutor do curso</h3></div>
107+
108+
<div class="form-group" ng-class="{ 'has-error' : cursoForm.instrutor.$invalid && !cursoForm.instrutor.$pristine }"><label class="col-sm-2 control-label">Instrutor:</label>
109+
<div class="col-sm-10" >
110+
<input name="instrutor" type="text" placeholder="Quem irá ministrar..." class="form-control" ng-model="selected"
85111
typeahead="contato as (contato.nome) for contato in contatos | filter:{nome: $viewValue}" required/>
112+
<p ng-show="cursoForm.instrutor.$invalid && !cursoForm.instrutor.$pristine" class="help-block">Nome do instrutor necessário!</p>
86113
</div>
87114
</div>
88115

89-
90116
<div class="hr-line-dashed"></div>
91117

118+
<button type="button" class="btn btn-white" ng-click="cancel()"><i class="fa fa-times"></i> Fechar </button>
119+
<button type="button" class="btn btn-danger" ng-show="isCreated()" ng-click="remove()"><i class="fa fa-trash"></i> Remover Curso </button>
120+
<button type="button" class="btn btn-primary" ng-show="isCreated()" ng-click="gerenciar()"><i class="fa fa-pencil"></i> Gerenciar Curso </button>
121+
<button type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> Salvar Curso </button>
92122
</form>
93123
</div>
94-
<div class="modal-footer">
95-
<button type="button" class="btn btn-white" ng-click="cancel()"><i class="fa fa-times"></i> Fechar </button>
96-
<button type="button" class="btn btn-danger" ng-show="isCreated()" ng-click="remove()"><i class="fa fa-trash"></i> Remover Curso </button>
97-
<button type="button" class="btn btn-primary" ng-show="isCreated()" ng-click="gerenciar()"><i class="fa fa-pencil"></i> Gerenciar Curso </button>
98-
<!--<button type="submit" class="btn btn-success" ng-click="salvar()"><i class="fa fa-floppy-o"></i> Salvar Curso </button>-->
99-
<button type="submit" class="btn btn-success" ng-click="salvar()"><i class="fa fa-floppy-o"></i> Salvar Curso </button>
100-
</div>
124+
101125
</div>
102126

‎Angular_Seed_Project/page/modais/modaluniversidade.controller.js

+18-13
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
1313

1414
universidadeService.sendSalvou(false);
1515
$scope.editar = false;
16-
// Se o modal vier com dados pré cadastrados
1716
if (angular.isDefined(getCurso)) {
1817
$scope.editar = true;
1918
$http({
2019
url: '/contacts/perfil',
2120
method: "GET",
2221
params: {token: userService.getToken(), mail: getCurso.instrutor.sAMAccountName}
2322
}).then(function (response) {
24-
2523
$scope.titulo = getCurso.nome;
2624
$scope.descricao = getCurso.descricao;
2725
$scope.local = getCurso.local;
@@ -34,24 +32,24 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
3432
$scope.horarioFim = data_fim.getHours() + ":" + data_fim.getMinutes();
3533
$scope.dataLimiteInscricao = new Date(getCurso.data_limite_inscricao);
3634
$scope.selected = response.data[0];
37-
3835
}).catch(function (err) {
39-
// console.log(err);
36+
4037
});
41-
// instrutor: instrutor,
4238
} else {
43-
$scope.minInscritos = 0;
44-
$scope.maxInscritos = 0;
39+
$scope.minInscritos = 1;
40+
$scope.maxInscritos = 1;
4541
$scope.diaInicio = new Date();
4642
}
4743

48-
4944
$scope.onChangeMinimo = function () {
5045
if ($scope.minInscritos > $scope.maxInscritos) $scope.maxInscritos = $scope.minInscritos;
46+
if ($scope.minInscritos == undefined) $scope.minInscritos = undefined;
47+
console.log($scope.minInscritos)
5148
};
5249

5350
$scope.onChangeMaximo = function () {
5451
if ($scope.minInscritos > $scope.maxInscritos) $scope.minInscritos = $scope.maxInscritos;
52+
if ($scope.maxInscritos == undefined) $scope.maxInscritos = undefined;
5553
};
5654

5755
$scope.cancel = function () {
@@ -63,7 +61,6 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
6361
universidadeService.sendCurso(getCurso);
6462
$state.go('universidade_manage');
6563
$modalInstance.close();
66-
6764
}
6865
};
6966

@@ -94,7 +91,18 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
9491
$scope.dataLimiteInscricao = new Date(ano, mes - 1, dia, hora, minuto);
9592
};
9693

97-
$scope.salvar = function () {
94+
$scope.salvar = function (isvalid) {
95+
if (!isvalid) {
96+
console.log('preenchimento inválido')
97+
swal({
98+
title: "Ops!",
99+
text: "Algum campo não foi preenchido corretamente.",
100+
type: "error",
101+
showConfirmButton: true
102+
});
103+
return
104+
}
105+
console.log('preenchimento válido')
98106

99107
if (angular.isUndefined($scope.selected)) return;
100108
var sAMAccountName = $scope.selected.mail.substring(0, $scope.selected.mail.indexOf('@'));
@@ -120,8 +128,6 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
120128
carga_horaria: $scope.cargaHoraria
121129
};
122130

123-
console.log($scope.data_inicio, $scope.dataLimiteInscricao)
124-
125131
if ($scope.editar) {
126132
$http({
127133
method: 'PUT'
@@ -176,7 +182,6 @@ function ModalInstanceCtrl($scope, $modalInstance, $http, userService, getCurso,
176182
};
177183

178184
$scope.remove = function () {
179-
180185
swal({
181186
title: "Você tem certeza?",
182187
text: "Você não poderá recuperar esse curso!",

0 commit comments

Comments
 (0)