Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SistemaGestionAdministrativa
ModuloPersonalCliente
Commits
1abb716d
Commit
1abb716d
authored
Jul 13, 2016
by
D’jalmar Gutierrez Titirico
🚲
Browse files
Merge branch 'iss6140-implementar-cargas-peticiones' into 'desarrollo'
#41
se agrego el paquete angular-loading-bar See merge request
!54
parents
b7278d6b
73024b95
Changes
6
Hide whitespace changes
Inline
Side-by-side
bower.json
View file @
1abb716d
...
...
@@ -19,7 +19,8 @@
"ng-tags-input"
:
"3.1.1"
,
"ui-router-extras"
:
"^0.1.2"
,
"angular-i18n"
:
"^1.5.6"
,
"angular-ui-tree"
:
"^2.16.0"
"angular-ui-tree"
:
"^2.16.0"
,
"angular-loading-bar"
:
"^0.9.0"
},
"devDependencies"
:
{
"angular-mocks"
:
"~1.4.11"
...
...
client/app/app.js
View file @
1abb716d
...
...
@@ -8,6 +8,7 @@ angular.module('moduloPersonalApp', [
'
ngSanitize
'
,
'
ngTagsInput
'
,
'
ngAnimate
'
,
'
angular-loading-bar
'
,
'
ui.router
'
,
'
ui.bootstrap
'
,
'
validation.match
'
,
...
...
client/app/app.scss
View file @
1abb716d
...
...
@@ -184,6 +184,19 @@ input[type=checkbox].with-font:checked ~ label:before {
//color: darkgreen;
}
//personalizacion del loading-bar
#loading-bar
.bar
{
background
:
$brand-info
;
height
:
4px
;
}
#loading-bar-spinner
.spinner-icon
{
border
:
solid
3px
transparent
;
border-top-color
:
$brand-info
;
border-left-color
:
$brand-info
;
width
:
18px
;
height
:
18px
;
}
//input[type=radio].with-font:focus ~ label:before,
//input[type=checkbox].with-font:focus ~ label:before,
//input[type=radio].with-font:focus ~ label,
...
...
client/app/postulaciones/modals/postulaciones.crear.modal.controller.js
View file @
1abb716d
...
...
@@ -2,7 +2,7 @@
(()
=>
{
class
PostulacionCrearModalController
{
constructor
(
$uibModalInstance
,
parametros
,
postulacionService
,
personaService
,
)
{
constructor
(
$uibModalInstance
,
parametros
,
postulacionService
,
personaService
)
{
this
.
enviado
=
false
;
this
.
errores
=
{};
this
.
modal
=
$uibModalInstance
;
...
...
client/app/postulaciones/postulaciones.controller.spec.js
View file @
1abb716d
...
...
@@ -5,7 +5,7 @@ describe('Controller: PostulacionesCtrl', function () {
// load the controller's module
beforeEach
(
module
(
'
moduloPersonalApp
'
));
var
PostulacionesCtrl
,
scope
,
cargoConvocatoriaService
;
var
PostulacionesCtrl
,
scope
,
cargoConvocatoriaService
,
convocatoriaService
;
var
postulaciones
=
{
'
count
'
:
3
,
'
rows
'
:
[
...
...
@@ -58,18 +58,19 @@ describe('Controller: PostulacionesCtrl', function () {
]
};
var
cargoConvocatoria
=
{
_id
:
1
,
fk_cargo
:
1
,
fk_convocatoria
:
1
,
Etapas
:
[
var
etapas
=
{
count
:
2
,
rows
:
[
{
_id
:
1
,
nombre
:
'
Etapa 1
'
,
porcentaje
:
50
,
porcentajeMinimo
:
30
,
orden
:
1
,
EvaluacionCargoEtapa
:
{
_id
:
1
,
fk_evaluacion
:
1
,
fk_cargo_convocatoria
:
1
,
fk_etapa
:
1
}
Evaluaciones
:
[{
_id
:
1
,
nombre
:
'
Evaluacion 1
'
}]
},
{
_id
:
2
,
...
...
@@ -77,32 +78,24 @@ describe('Controller: PostulacionesCtrl', function () {
porcentaje
:
50
,
porcentajeMinimo
:
20
,
orden
:
0
,
EvaluacionCargoEtapa
:
{
_id
:
2
,
fk_evaluacion
:
2
,
fk_cargo_convocatoria
:
1
,
fk_etapa
:
2
}
}
],
Evaluaciones
:
[
{
_id
:
1
,
nombre
:
'
Evaluacion 1
'
,
EvaluacionCargoEtapa
:
{
_id
:
1
,
fk_evaluacion
:
1
,
fk_cargo_convocatoria
:
1
,
fk_etapa
:
1
}
},
{
_id
:
2
,
nombre
:
'
Evaluacion 2
'
,
EvaluacionCargoEtapa
:
{
_id
:
2
,
fk_evaluacion
:
2
,
fk_cargo_convocatoria
:
1
,
fk_etapa
:
2
}
Evaluaciones
:
[{
_id
:
2
,
nombre
:
'
Evaluacion 2
'
}]
}
]
};
// Initialize the controller and a mock scope
beforeEach
(
inject
(
function
(
$controller
,
$rootScope
,
$q
,
_CargoConvocatoriaService_
,
$stateParams
)
{
beforeEach
(
inject
(
function
(
$controller
,
$rootScope
,
$q
,
_CargoConvocatoriaService_
,
_ConvocatoriaService_
,
$stateParams
)
{
cargoConvocatoriaService
=
_CargoConvocatoriaService_
;
convocatoriaService
=
_ConvocatoriaService_
;
$stateParams
.
cargoConvocatoriaId
=
1
;
scope
=
$rootScope
.
$new
();
let
postulacionesStub
=
sinon
.
stub
(
cargoConvocatoriaService
,
'
postulaciones
'
)
postulacionesStub
.
returns
(
$q
.
when
(
postulaciones
));
let
cargoConvocatoriaStub
=
sinon
.
stub
(
c
argoC
onvocatoriaService
,
'
cargoConvocatoria
'
)
cargoConvocatoriaStub
.
returns
(
$q
.
when
(
cargoConvocatoria
));
let
cargoConvocatoriaStub
=
sinon
.
stub
(
convocatoriaService
,
'
etapas
'
)
cargoConvocatoriaStub
.
returns
(
$q
.
when
(
etapas
));
PostulacionesCtrl
=
$controller
(
'
PostulacionCtrl
'
,
{
$scope
:
scope
,
cargoConvocatoriaService
,
...
...
@@ -112,9 +105,9 @@ describe('Controller: PostulacionesCtrl', function () {
it
(
'
Debe realizar el calculo de las notas de los postuantes a un cargo de una convocatoria
'
,
function
()
{
scope
.
$digest
();
expect
(
PostulacionesCtrl
.
cargoConvocatoria
.
Etapa
s
[
0
].
orden
).
to
.
be
.
equal
(
0
);
expect
(
PostulacionesCtrl
.
cargoConvocatoria
.
Etapa
s
[
1
].
orden
).
to
.
be
.
equal
(
1
);
expect
(
PostulacionesCtrl
.
cargoConvocatoria
.
Etapa
s
[
0
].
Evaluaciones
[
0
].
_id
).
to
.
be
.
equal
(
2
);
expect
(
PostulacionesCtrl
.
etapas
.
row
s
[
0
].
orden
).
to
.
be
.
equal
(
0
);
expect
(
PostulacionesCtrl
.
etapas
.
row
s
[
1
].
orden
).
to
.
be
.
equal
(
1
);
expect
(
PostulacionesCtrl
.
etapas
.
row
s
[
0
].
Evaluaciones
[
0
].
_id
).
to
.
be
.
equal
(
2
);
expect
(
PostulacionesCtrl
.
postulaciones
.
rows
[
0
].
_id
).
to
.
be
.
equal
(
3
);
});
});
client/index.html
View file @
1abb716d
...
...
@@ -16,6 +16,7 @@
<link
rel=
"stylesheet"
href=
"bower_components/ng-tags-input/ng-tags-input.min.css"
/>
<link
rel=
"stylesheet"
href=
"bower_components/ng-tags-input/ng-tags-input.bootstrap.min.css"
/>
<link
rel=
"stylesheet"
href=
"bower_components/angular-ui-tree/dist/angular-ui-tree.css"
/>
<link
rel=
"stylesheet"
href=
"bower_components/angular-loading-bar/build/loading-bar.css"
/>
<!-- endbower -->
<!-- endbuild -->
<!-- build:css({.tmp,client}) app/app.css -->
...
...
@@ -67,6 +68,7 @@
<script
src=
"bower_components/ui-router-extras/release/ct-ui-router-extras.js"
></script>
<script
src=
"bower_components/angular-i18n/angular-locale_es-bo.js"
></script>
<script
src=
"bower_components/angular-ui-tree/dist/angular-ui-tree.js"
></script>
<script
src=
"bower_components/angular-loading-bar/build/loading-bar.js"
></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js(.tmp) app/app.js -->
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment