From a904766db66a9e30d9f9fde2570f14e66212e0f3 Mon Sep 17 00:00:00 2001
From: Reynaldo Reyes <Reynaldo.Reyes.4@gmail.com>
Date: Tue, 7 Jun 2016 22:46:09 -0400
Subject: [PATCH] Update professor module

---
 .../professor/modal/new_password_modal.html   | 41 +++++++++++++
 app/partials/professor/professor.services.js  | 12 ++++
 .../professor/professor_create.controller.js  |  2 +
 app/partials/professor/professor_create.html  | 37 +++++++-----
 .../professor/professor_list.controller.js    | 30 +++-------
 app/partials/professor/professor_list.html    | 12 ++--
 .../professor/professor_update.controller.js  | 60 +++++++++++++++++--
 app/partials/professor/professor_update.html  | 29 +++++----
 8 files changed, 165 insertions(+), 58 deletions(-)
 create mode 100644 app/partials/professor/modal/new_password_modal.html

diff --git a/app/partials/professor/modal/new_password_modal.html b/app/partials/professor/modal/new_password_modal.html
new file mode 100644
index 0000000..4b7c965
--- /dev/null
+++ b/app/partials/professor/modal/new_password_modal.html
@@ -0,0 +1,41 @@
+<div class="modal-header">
+    <h3 class="modal-title">Nueva Contraseña</h3>
+</div>
+<div style="text-align: center" class="modal-body">
+    {{ vm.mensaje }}
+</div>
+<div class="modal-footer">
+     <div class="col-md-6 column" ng-show="vm.showFields">
+        <label style="text-align: center" for="password">Contraseña</label>
+        <input type="password" name="password" class="form-control" ng-model="vm.Password1" maxlength="20" required/>
+        <div class="error" ng-show="vm.invalid">
+            <small class="error" 
+            ng-show="vm.invalid">
+                Las Contraseñas deben coincidir.
+            </small>
+        </div>
+    </div>
+	<div class="col-md-6 column" ng-show="vm.showFields">
+	    <label style="text-align: center" for="password">Repetir Contraseña</label>
+	    <input type="password" name="password" class="form-control" ng-model="vm.Password2" maxlength="20" required/>
+	    <div class="error" ng-show="vm.invalid">
+	        <small class="error" 
+	        ng-show="vm.invalid">
+	            Las Contraseñas deben coincidir.
+	        </small>
+	    </div>
+	</div>
+	<button class="btn btn-primary" 
+		type="button" 
+	    ng-click="vm.checkPassword()"
+	    ng-show="vm.showFields"
+	    style="margin-top:20px;">
+	    Cambiar Contraseña
+	</button>
+	<div ng-show="!vm.showFields">
+	    <button class="btn btn-primary" 
+	    ng-show="vm.botonOk" 
+	    type="button" 
+	    ng-click="ok()">OK</button>
+	</div>
+</div>
diff --git a/app/partials/professor/professor.services.js b/app/partials/professor/professor.services.js
index 0676492..1df2e57 100644
--- a/app/partials/professor/professor.services.js
+++ b/app/partials/professor/professor.services.js
@@ -4,6 +4,7 @@
     angular
         .module('app.professor')
         .factory('professors', professors)
+        .factory('passwordReset', passwordReset)
         .value('selectedCourse',{})
         .value('selectedSection',{})
         .value('selectedStudent',{})
@@ -40,4 +41,15 @@
                 }
             });
     };
+    passwordReset.$inject = ['$resource','$rootScope','authentication'];
+    function passwordReset($resource, $rootScope, authentication){
+        return $resource('http://'+$rootScope.domainUrl+'/reset/:id', {}, {
+                update: {
+                    method: 'PUT',
+                    headers: {
+                        Authorization: 'Bearer '+ authentication.getToken()
+                    }
+                }
+            });
+    };
 })();
\ No newline at end of file
diff --git a/app/partials/professor/professor_create.controller.js b/app/partials/professor/professor_create.controller.js
index 79e2a32..f99b549 100644
--- a/app/partials/professor/professor_create.controller.js
+++ b/app/partials/professor/professor_create.controller.js
@@ -47,6 +47,8 @@
                         vm.mensaje = 
                         "Error al agregar al profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre;
                     });
+            }else{
+                vm.submitted = true;
             }
         }
 
diff --git a/app/partials/professor/professor_create.html b/app/partials/professor/professor_create.html
index eb52293..af3475c 100644
--- a/app/partials/professor/professor_create.html
+++ b/app/partials/professor/professor_create.html
@@ -65,26 +65,33 @@
                             </small>
                         </div>
                     </div>
-                    <div class="col-md-4 column">
-                        <label for="telefono">Número de Teléfono</label>
-                        <input type="telefono" class="form-control" 
-                        name="telefono" ng-model="vm.profesor.Telefono" 
-                        ng-pattern="/\d{13}/" maxlength="13"
-                        placeholder="04241239876"/>
-                        <small class="error" 
-                        ng-show="vm.data_input_form.telefono.$error.pattern">
-                            El Formato del Número de Teléfono es incorrecto.
-                        </small>
-                    </div>
                     <div class="col-md-4 column">
                         <label for="password">Contraseña *</label>
-                        <input type="password" class="form-control" ng-model="vm.profesor.Password" maxlength="20" required/>
-                        <div class="error" ng-show="vm.submitted && vm.data_input_form.password.$invalid">
-                            <small class="error" ng-show="vm.data_input_form.password.$error.required">
-                                La Contraseña del Profesor es obligatorio.
+                        <input type="password" name="password" class="form-control" ng-model="vm.profesor.Password" maxlength="20" required/>
+                        <div class="error" ng-show="vm.submitted && 
+                        vm.data_input_form.password.$invalid">
+                            <small class="error" 
+                            ng-show="vm.data_input_form.password.$error.required">
+                                La Contraseña del Profesor es obligatoria.
                             </small>
                         </div>
                     </div>
+                    <div class="col-md-4 column">
+                        <label for="telefono">Número de Teléfono</label>
+                        <input type="telefono" class="form-control" 
+                        name="telefono" ng-model="vm.profesor.Telefono" 
+                        ng-minlength="7" ng-maxlength="13"
+                        placeholder="04241239876"/>
+                        <small class="error" 
+                        ng-show="vm.data_input_form.telefono.$error.minlength">
+                            La longitud del Número de Teléfono es de 7 números mínimo.
+                        </small>
+                        <small class="error" 
+                        ng-show="vm.data_input_form.telefono.$error.maxlength">
+                            La longitud del Número de Teléfono es de 13 números máximo.
+                        </small>
+                    </div>
+                    
                 </div>
             </div>
             <label> * Estos campos son obligatorios.</label>
diff --git a/app/partials/professor/professor_list.controller.js b/app/partials/professor/professor_list.controller.js
index 3e2060f..6ed2b30 100644
--- a/app/partials/professor/professor_list.controller.js
+++ b/app/partials/professor/professor_list.controller.js
@@ -6,8 +6,8 @@
         .controller('ProfessorListCtrl', ProfessorListCtrl)
 
     ProfessorListCtrl.$inject = 
-    [ '$scope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
-    function ProfessorListCtrl( $scope, $state, professors, $modal, profesorSeleccionado ){
+    [ '$scope', '$state', 'professors', '$modal', 'profesorSeleccionado','data' ];
+    function ProfessorListCtrl( $scope, $state, professors, $modal, profesorSeleccionado, data ){
         
         var vm = this;
         vm.lista = true;
@@ -15,17 +15,8 @@
         var profesorArray = [];
         professors.query(
             function (successResult){
-               vm.profesor = successResult;
-                angular.forEach(vm.profesor, function (value){
-                    profesorArray.push({
-                        Cedula:value.id,
-                        Nombre:value.name,
-                        Apellido:value.lastname,
-                        Telefono:value.number,
-                        Correo: value.email
-                    });
-                });
-                vm.listaProfesor = profesorArray;
+                vm.professors = successResult;
+                vm.listaProfesor = vm.professors;
                 
             },
             function(){
@@ -53,15 +44,15 @@
             vm.acceptButton = true;
             vm.botonCancelar = false;
 
-            professors.delete({id: vm.profesor[index]._id}, 
+            professors.delete({id: vm.professors[index]._id}, 
                 function () {
                     vm.rsplice = true;
                     vm.mensaje = 
-                    "Profesor " + vm.profesor[index].name + " eliminado";
+                    "Profesor " + vm.professors[index].name + " eliminado";
                 },
                 function () {
                     vm.mensaje = 
-                    "Error eliminando al Profesor " + vm.profesor[index].name;
+                    "Error eliminando al Profesor " + vm.professors[index].name;
                 });
         };
 
@@ -73,12 +64,7 @@
         };
 
         vm.modificarProfesor = function (index) {
-            profesorSeleccionado._id = vm.profesor[index]._id;
-            profesorSeleccionado.Cedula = vm.profesor[index].id;
-            profesorSeleccionado.Nombre = vm.profesor[index].name;
-            profesorSeleccionado.Apellido = vm.profesor[index].lastname;
-            profesorSeleccionado.Telefono = vm.profesor[index].number;
-            profesorSeleccionado.Correo = vm.profesor[index].email;
+            data.professorId = vm.professors[index]._id;
             $state.go('ProfessorUpdate');
         };
 
diff --git a/app/partials/professor/professor_list.html b/app/partials/professor/professor_list.html
index 2bfebe6..98ce6c8 100644
--- a/app/partials/professor/professor_list.html
+++ b/app/partials/professor/professor_list.html
@@ -5,13 +5,13 @@
         <table class="table table-bordered table-striped">
             <thead>
             <tr>
-                <th width="20%">
+                <th width="20%" style="text-align: center">
                     Cedula
                 </th>
-                <th width="20%">
+                <th width="20%" style="text-align: center">
                     Nombre
                 </th>
-                <th width="20%">
+                <th width="20%" style="text-align: center">
                     Apellido
                 </th>
                 <th width="20%" style="text-align: center">
@@ -24,9 +24,9 @@
             </thead>
             <tbody>
             <tr ng-repeat="profesor in vm.listaProfesor">
-                <td style="vertical-align:middle">{{ profesor.Cedula }}</td>
-                <td style="vertical-align:middle">{{ profesor.Nombre }}</td>
-                <td style="vertical-align:middle">{{ profesor.Apellido }}</td>
+                <td style="vertical-align:middle">{{ profesor.id }}</td>
+                <td style="vertical-align:middle">{{ profesor.name }}</td>
+                <td style="vertical-align:middle">{{ profesor.lastname }}</td>
                 <td style="text-align: center">
                     <span title="Haga click para Modificar un Profesor"  
                     class="glyphicon glyphicon-edit" 
diff --git a/app/partials/professor/professor_update.controller.js b/app/partials/professor/professor_update.controller.js
index 6758341..6dde984 100644
--- a/app/partials/professor/professor_update.controller.js
+++ b/app/partials/professor/professor_update.controller.js
@@ -6,13 +6,23 @@
         .controller('ProfessorUpdateCtrl', ProfessorUpdateCtrl)
 
    ProfessorUpdateCtrl.$inject = 
-    ['$scope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
-    function ProfessorUpdateCtrl ( $scope, $state, professors, $modal, profesorSeleccionado ){
+    ['$scope', '$state', 'professors', '$modal', 'profesorSeleccionado', 'data', 'passwordReset' ];
+    function ProfessorUpdateCtrl ( $scope, $state, professors, $modal, profesorSeleccionado, data, passwordReset){
         
         var vm = this;
         vm.botonOk = false;
+        vm.id = data.professorId;
         vm.mensaje = "";
-        vm.profesor = profesorSeleccionado;
+        vm.profesor = null;
+
+        professors.get({id:vm.id},
+            function(success){
+                vm.profesor = success;
+                //vm.profesor.Password 
+            },
+            function(){
+                console.log("Error obteniendo profesor");
+            })
 
 
         vm.submit = function() {
@@ -30,7 +40,7 @@
             $scope.modalInstance = $modal.open({
                 templateUrl: 'partials/professor/modal/update_professor_modal.html',
                 scope: $scope,
-                size: 'sm',
+                size: 'sm'
             });
 
             professors.update({ id: vm.profesor._id}, professor, 
@@ -47,6 +57,48 @@
                     "Error al modificar al profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre;
                 });
         }
+        vm.newPassword = function (){
+            vm.mensaje = "Inserte el nuevo Password del profesor "+ vm.profesor.lastname;
+            vm.invalid = false;
+            vm.showFields = true;
+            vm.showButton = false;
+            $scope.modalInstance = $modal.open({
+                templateUrl: 'partials/professor/modal/new_password_modal.html',
+                scope: $scope,
+                size: 'md'
+            });
+        }
+
+        vm.checkPassword = function (){
+            if(vm.Password1!=vm.Password2){
+                vm.invalid = true;
+            }else{
+                vm.invalid = false;
+                vm.showFields = false;
+                vm.showButton = true;
+                var updatedProfessor = {
+                    "id": vm.profesor.id,
+                    "name": vm.profesor.name,
+                    "lastname": vm.profesor.lastname,
+                    "email": vm.profesor.email,
+                    "number": vm.profesor.number,
+                    "role": "professor",
+                    "password": vm.Password1
+                };
+
+                passwordReset.update({ id: vm.profesor._id}, updatedProfessor, 
+                    function(){
+                        vm.botonOk = true;
+                        vm.mensaje = 
+                        "Contraseña actualizada";
+                    },
+                    function(){
+                        vm.botonOk = true;
+                        vm.mensaje = 
+                        "Error al modificar contraseña";
+                    });
+                }
+            }
 
         $scope.ok = function () {
             $state.go('ProfessorList');
diff --git a/app/partials/professor/professor_update.html b/app/partials/professor/professor_update.html
index 6fe8bab..6b71980 100644
--- a/app/partials/professor/professor_update.html
+++ b/app/partials/professor/professor_update.html
@@ -10,15 +10,15 @@
             <div class="row">
                 <div class="col-md-4 column">
                     <label for="cedula">Cedula</label>
-                    <input type="numeric" class="form-control" name="cedula" readonly="readonly" ng-model="vm.profesor.Cedula"/>
+                    <input type="numeric" class="form-control" name="cedula" readonly="readonly" ng-model="vm.profesor.id"/>
                 </div>
                 <div class="col-md-4 column">
                     <label for="nombre">Nombre</label>
-                    <input type="text" class="form-control" name="nombre" readonly="readonly" ng-model="vm.profesor.Nombre"/>
+                    <input type="text" class="form-control" name="nombre" readonly="readonly" ng-model="vm.profesor.name"/>
                 </div>
                 <div class="col-md-4 column">
                     <label for="apellido">Apellido</label>
-                    <input type="text" class="form-control" name="apellido" readonly="readonly" ng-model="vm.profesor.Apellido"/>
+                    <input type="text" class="form-control" name="apellido" readonly="readonly" ng-model="vm.profesor.lastname"/>
                 </div>
             </div>
             <div class="row clearfix"><div class="col-md-12 column"><br><br>
@@ -27,7 +27,7 @@
                 <div class="col-md-4 column">
                     <label for="email">Dirección de Correo Electronico</label>
                     <input type="email" class="form-control" name="email" 
-                    ng-model="vm.profesor.Correo" 
+                    ng-model="vm.profesor.email" 
                     ng-pattern="/^[a-z]+[a-z0-9._]+@[a-z]+\.[a-z.]{2,5}$/" placeholder="me@example.com"/>
                     <small class="error" 
                     ng-show="vm.data_input_form.correo.$error.pattern">
@@ -36,13 +36,21 @@
                 </div>
                 <div class="col-md-4 column">
                     <label for="telefono">Número de Teléfono</label>
-                    <input type="phone" class="form-control" 
-                    name="telefono" ng-model="vm.profesor.Telefono" 
-                    ng-pattern="/\d{4}-\d{3}-\d{4}/" maxlength="13" 
-                    placeholder="0212-574-1234"/>
-                        <small class="error" ng-show="vm.data_input_form.telefono.$error.pattern">
-                            El formato del Teléfono debe ser: 0212-789-5551.
+                    <input type="telefono" class="form-control" 
+                        name="telefono" ng-model="vm.profesor.number" 
+                        ng-minlength="7" ng-maxlength="13"
+                        placeholder="04241239876"/>
+                        <small class="error" 
+                        ng-show="vm.data_input_form.telefono.$error.minlength">
+                            La longitud del Número de Teléfono es de 7 números mínimo.
                         </small>
+                        <small class="error" 
+                        ng-show="vm.data_input_form.telefono.$error.maxlength">
+                            La longitud del Número de Teléfono es de 13 números máximo.
+                        </small>
+                </div>
+                <div class="col-md-offset-1 col-md-2 column">
+                    <button type="button" class="btn-primary btn" style="margin: 10px" ng-click="vm.newPassword()">Cambiar Contraseña</button>
                 </div>
             </div>
         </div>
@@ -54,7 +62,6 @@
                 <p class="input-group">
                     <span class="input-group-btn">
                         <button type="submit" class="btn-success btn">Modificar Profesor</button>
-                        <button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
                     </span>
                 </p>
             </div>