leaving Polytech

commit/push my changes before leaving polytech.

Author: Clement-Roque

Diff for: Zenergy/Zenergy/Scripts/Controllers/registerPageController.js

@@ -1,4 +1,24 @@
-zenergyApp.directive('password', function () {
+zenergyApp.directive('samepassword', function () {
+
+    return {
+        require: 'ngModel',
+        link: function (scope, elm, attrs, ctrl) {
+            ctrl.$validators.samepassword = function (modelValue, viewValue) {
+                if (ctrl.$isEmpty(modelValue)) {
+                    // consider empty models to be invalid
+                    return false;
+                }
+
+                if (viewvalue != $scope.user) {
+                    // it is valid
+                    return true;
+                }
+
+                // it is invalid
+                return false;
+            };
+        }
+    }
 
 });
 
@@ -7,29 +27,23 @@ zenergyApp.controller("registerPageController", ["$scope", "$http", "$window", f
 
     $scope.user = {mail: '', password: '', passwordBis: '',  lastName:'', firstName:'', adr1:'', adr2:'', pc:'', town:'', phone:''};
     $scope.hasError = false;
-    $scope.passdiff = false;
+        
+    $scope.register = function () {
+        var response = $http({
+            url: 'api/Account/register',
+            method: 'POST',
+            data: { userId: 1, password: CryptoJS.MD5($scope.user.password).toString(), lastName: $scope.user.lastName, firstName: $scope.user.firstName, adr1: $scope.user.adr1, adr2: $scope.user.adr2, pc: $scope.user.pc, town: $scope.user.town, mail: $scope.user.mail, phone: $scope.user.phone },
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        }).then(function successCallback(response) {
+            $scope.hasError = false;
+            window.location.replace("/Login");
+        }, function errorCallback(response) {
+            $scope.hasError = true;
+            $scope.user.mail = '';
+            $scope.user.password = '';
+        });
 
-    if ($scope.user.password != $scope.user.passwordBis) {
-        $scope.passdiff = true;
-    }
-    else {
-        $scope.register = function () {
-            var response = $http({
-                url: 'api/Account/register',
-                method: 'POST',
-                data: { userId: 1, password: CryptoJS.MD5($scope.user.password).toString(), lastName: $scope.user.lastName, firstName: $scope.user.firstName, adr1: $scope.user.adr1, adr2: $scope.user.adr2, pc: $scope.user.pc, town: $scope.user.town, mail: $scope.user.mail, phone: $scope.user.phone },
-                headers: {
-                    'Content-Type': 'application/json'
-                }
-            }).then(function successCallback(response) {
-                $scope.hasError = false;
-                window.location.replace("/Login");
-            }, function errorCallback(response) {
-                $scope.hasError = true;
-                $scope.user.mail = '';
-                $scope.user.password = '';
-            });
-
-        };
-    }
+    };
 }]);

Diff for: Zenergy/Zenergy/Views/Register/index.cshtml

@@ -10,17 +10,18 @@
             <h1>Register</h1>
             <form ng-submit="register()">
 
-                <div class="form-group" ng-class="{ 'has-error': hasError}">
+                <div class="form-group" >
                     <input type="email" class="form-control" ng-model="user.mail" placeholder="Email" required>
                 </div>
 
-                <div class="form-group" ng-class="{ 'has-error': passdiff}" password>
-                    <input type="password" class="form-control" ng-model="user.password" placeholder="Password" required>
+                <div class="form-group">
+                    <input type="password" class="form-control" ng-model="user.password" placeholder="Password" required >
                 </div>
 
-                <div class="form-group" ng-class="{ 'has-error': passdiff}">
-                    <input type="password" class="form-control" ng-model="user.passwordBis" placeholder="Password Confirmation" required>
+                <div class="form-group" >
+                    <input type="password" class="form-control" ng-model="user.passwordBis" placeholder="Password Confirmation" required samepassword>
                 </div>
+                <span ng-show="form.name.$error.samepassword">The password must be equal</span>
 
                 <div class="form-group">
                     <input type="text" class="form-control" ng-model="user.firstName" placeholder="Firstname">
@@ -50,8 +51,6 @@
                     <input type="text" class="form-control" ng-model="user.phone" placeholder="Phone ">
                 </div>
 
-                <p class="text-danger" ng-if="hasError">Invalid email or password</p>
-
                 <input type="submit" id="submit" value="Sign in" class="btn btn-primary" />
             </form>
         </div>