Skip to content

Commit

Permalink
16 de diciembre
Browse files Browse the repository at this point in the history
  • Loading branch information
chibchombiano26 committed Dec 19, 2015
1 parent de338c2 commit 9381de9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ <h1 class="c-white">Warning!!</h1>
<!-- Help -->
<script src="js/hefesoft/help/helperModalController.js"></script>

<!-- Prestador (se necesita para crear el prestador apenas ingresa el usuario) -->
<script src="js/hefesoft/Prestador/sevice/prestador.js"></script>

<!-- Temp -->
<script src="js/hefesoft/imagenes/imagenesFb.js"></script>
<script src="vendors/hefesoft/fb/services/fbHefesoft.js"></script>
Expand Down
5 changes: 4 additions & 1 deletion js/controllers/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ materialAdmin
// LOGIN
//=================================================

.controller('loginCtrl', function($scope, $q, authGoogleService, $state, pushGcmService, pubNubService, PubNub, $rootScope, parseService, growlService, speechService, diagnosticosService, citasService, cfpLoadingBar){
.controller('loginCtrl', function($scope, $q, authGoogleService, $state, pushGcmService, pubNubService, PubNub, $rootScope, parseService, growlService, speechService, diagnosticosService, citasService, cfpLoadingBar, prestadorService){

//Status
this.login = 1;
Expand All @@ -304,6 +304,9 @@ materialAdmin
window.hefesoftGoogleToken = authResult.client_id;
authGoogleService.token = authResult.client_id;
authGoogleService.getUserInfo().then(success, parseService.errorHandler);

//Inicializa los prestadores y crea uno por defecto si no se han inicializado
prestadorService.list();
});

$scope.$on('event:google-plus-signin-failure', function (event, authResult) {
Expand Down
2 changes: 1 addition & 1 deletion js/hefesoft/Prestador/sevice/prestador.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ angular.module('odontologiaApp')
}
else{
var prestador = Parse.User.current().toJSON();
dataFactory.save({email: prestador.email, nombre: prestador.email, especialidad : '', telefono : '', idCalendar : 'primary', pictureUrl : prestador.pictureUrl })
dataFactory.save({email: prestador.email, nombre: prestador.email, especialidad : '', telefono : '', idCalendar : prestador.email, pictureUrl : prestador.pictureUrl })
.then(function(result){
var data = [];
data.push(result);
Expand Down
3 changes: 1 addition & 2 deletions js/hefesoft/citas/Controller/citas.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@ angular.module('odontologiaApp')


function adicionarGoogleCalendar(item){
debugger
var elementoProcesado = agendaHelperService.procesarAdicionado(item);
calendarGetData.insert(elementoProcesado, $scope.calendarId).then(
calendarGetData.insert(elementoProcesado, item.prestador.idCalendar).then(
function(insertado){
console.log(insertado);
});
Expand Down
2 changes: 2 additions & 0 deletions js/hefesoft/citas/views/citas.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ <h2>Citas <small> Listado de citas por aprobar/denegar</small></h2>
<div class="lv-title">Estado: {{item.estado}}</div>
<small class="lv-small">{{item.message}}</small>

<small class="lv-small">Prestador: {{item.prestador.nombre}}</small>

<ul class="lv-attrs">

<li>
Expand Down

0 comments on commit 9381de9

Please sign in to comment.