covas_mobile/lib/classes/MyDrawer.dart

@@ -3,7 +3,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:http/http.dart' as http;
 import 'dart:io';
 import '../pages/EditProfile.dart';
-import '../pages/ListItemMenu.dart';
 import 'alert.dart';
 
 import '../variable/globals.dart' as globals;
@@ -95,10 +94,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
             leading: Icon(Icons.home),
             title: Text('Home'),
             onTap: () {
-              Navigator.pushReplacement(
+              Navigator.pop(context); // Close the drawer
-                  context, MaterialPageRoute(builder: (_) => ListItemMenu()));
-
-              /// Close the drawer
             },
           ),
           ListTile(

covas_mobile/lib/pages/EditProfile.dart

@@ -96,11 +96,9 @@ class _EditProfileState extends State<EditProfile>
     var confirmedPassword = inputPasswordConfirmed.text;
     var birth = DateTime.parse(formatDate(inputBirth.text));
 
-    if ((password.isNotEmpty) && (confirmedPassword.isNotEmpty)) {
+    if (password != confirmedPassword) {
-      if (password != confirmedPassword) {
+      showAlertDialog(context, "Erreur", "Mot de passe different");
-        showAlertDialog(context, "Erreur", "Mot de passe different");
+      return;
-        return;
-      }
     }
 
     var urlPut = Uri.parse("${globals.api}/users/me");
@@ -120,14 +118,11 @@ class _EditProfileState extends State<EditProfile>
             'firstName': firstName,
             'password': password,
             'email': email,
-            'roles': '',
+            'birth': birth
-            'birth': birth.toString()
           }));
       print(responsePut.statusCode);
       if (responsePut.statusCode == 200) {
         showEventDialog(context, "Votre utilisateur a été modifié");
-        Navigator.pushReplacement(
-            context, MaterialPageRoute(builder: (_) => EditProfile()));
         return;
       }
 
@@ -326,7 +321,7 @@ class _EditProfileState extends State<EditProfile>
                       }
                     },
                     child: Text(
-                      'Modifier le profil',
+                      'Ajouter',
                       style: TextStyle(color: Colors.white, fontSize: 25),
                     ),
                   ),