diff --git a/README.md b/README.md index d98cc66..5342fc6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Description -Version mobile de l'application web ScoDoc (v1.5) +Version mobile de l'application web ScoDoc (v1.6) ### Fonctionnalités: - Login diff --git a/src/ScoDoc/Etudiant.js b/src/ScoDoc/Etudiant.js index 62416d7..bbeb24c 100644 --- a/src/ScoDoc/Etudiant.js +++ b/src/ScoDoc/Etudiant.js @@ -115,16 +115,18 @@ class Etudiant extends Component { - + - + ) diff --git a/src/ScoDoc/GestionSemestre.js b/src/ScoDoc/GestionSemestre.js index ab2291c..ffbe6b7 100644 --- a/src/ScoDoc/GestionSemestre.js +++ b/src/ScoDoc/GestionSemestre.js @@ -1,5 +1,5 @@ import React, {Component} from "react"; -import {Tabs, Tab} from "react-bootstrap" +import {Tabs, Tab, Nav, NavItem, NavLink} from "react-bootstrap" import Accueil from "./GestionSemestre/Accueil"; import Absences from "./GestionSemestre/Absences"; import Etudiants from "./GestionSemestre/Etudiants"; @@ -17,7 +17,8 @@ class GestionSemestre extends Component { id: "", name: '', defaulttab: "Accueil", - defaultsel: "" + defaultsel: "", + loading: true } } @@ -26,7 +27,7 @@ class GestionSemestre extends Component { if (this.props.location.tab) { this.setState({defaulttab: this.props.location.tab, defaultsel: this.props.location.etudid, - id: this.props.location.etudid, name: this.state.selectOptions.find(option => option.value === this.state.id) + id: this.props.location.etudid, name: this.props.location.name }) } } @@ -44,7 +45,7 @@ class GestionSemestre extends Component { // Création d'une liste pour le select res.data.map((student) => { let joined = this.state.selectOptions.concat({label: student.nom_disp + " " + student.prenom, value: student.etudid}); - this.setState({selectOptions: joined}) + this.setState({selectOptions: joined, loading: false}) }) }) } @@ -62,20 +63,23 @@ class GestionSemestre extends Component { {/* Selection de l'étudiant pour les sous-composants */}
Choix de l'étudiant -