Merge branch 'master' into dorian

# Conflicts:
#	src/view/team-add.js
#	src/view/team.js

src/view/team-add.js

@@ -18,6 +18,12 @@ export default {
         addTeam: function () {
             try {
 
+                if (this.teamAEdit != null) {
+                    this.id = this.teamAEdit.id
+                    this.name = this.teamAEdit.name
+                    this.description = this.teamAEdit.description
+                }
+
                 this.errorMessage = '';
                 if (!this.id) {
                     throw new RequiredFieldError("ID");
@@ -37,9 +43,11 @@ export default {
 
                 const team = { id: this.id, name: this.name, description: this.description};
 
+
                 if (this.teamAEdit != null) {
                     this.$emit('teamModifie', team);
                 } else {
+
                     this.$emit('teamAjoute', team);
                 }
 
@@ -63,15 +71,18 @@ export default {
                     <div v-bind:style="{ color: errorColor}">{{ errorMessage }}</div>
                     <div>
                         <label>ID</label><br/>
-                        <input type="text" v-model="id"/>
+                        <p v-if=this.teamAEdit><input type="text" v-model="this.teamAEdit.id" /></p>
+                        <p v-else><input type="text" v-model="this.id" /></p>
                     </div>
                     <div>
                         <label>Name</label><br/>
-                        <input type="text" v-model="name"/>
+                        <p v-if=this.teamAEdit><input type="text" v-model="this.teamAEdit.name" /></p>
+                        <p v-else><input type="text" v-model="this.name" /></p>
                     </div>
                     <div>
                         <label>Description</label><br/>
-                        <textarea v-model="description"></textarea>
+                        <p v-if=this.teamAEdit><textarea v-model="this.teamAEdit.description"/></p>
+                        <p v-else><textarea v-model="this.description" /></p>
                     </div>
                     <input type="submit" value="Create Team" @click="addTeam"/>
                 </form>

src/view/team.js

@@ -17,18 +17,16 @@ export default {
 
         editParam: function (team) {
             this.teamAEdit=team
-            console.log('lanceEdit')
         },
 
         updateTeam: function (team) {
-            console.log('update')
             for (var i = 0; i < this.allTeam.length; i++) {
                 if (this.allTeam[i].id == this.teamAEdit.id) {
-                    console.log('update + +')
                     this.allTeam[i].name = team.name
                     this.allTeam[i].description=team.description
                 }
             }
+            this.teamAEdit = null
         },
 
         exportTeam: function(){