theal
/
ScoDocMobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

Release 1.6 

Améliorations mineures de l'interface
Fix: "Absences de undefined" + Erreur
This commit is contained in:
Theal0 2021-06-11 12:53:42 +02:00
parent ef3c3ce7b8
commit 5e00bd068c
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,7 +2,7 @@
## Description ## Description
Version mobile de l'application web ScoDoc (v1.5) Version mobile de l'application web ScoDoc (v1.6)
### Fonctionnalités: ### Fonctionnalités:
- Login - Login

10
src/ScoDoc/Etudiant.js
View File

@ -115,16 +115,18 @@ class Etudiant extends Component {
<Link to={{ <Link to={{
pathname: `/${window.location.href.split('/')[7]}/Scolarite/${sem.formsemestre_id}/GestionSem`, pathname: `/${window.location.href.split('/')[7]}/Scolarite/${sem.formsemestre_id}/GestionSem`,
tab: "Absences", tab: "Absences",
etudid: window.location.href.split('/')[10] etudid: window.location.href.split('/')[10],
name: this.state.etud.nomprenom
}}> }}>
<Button variant="primary" style={{"margin-right": "2px"}}>Vers Absences</Button> <Button variant="primary" style={{"margin-right": "2px", "margin-bottom": "2px"}}>Vers Absences</Button>
</Link> </Link>
<Link to={{ <Link to={{
pathname: `/${window.location.href.split('/')[7]}/Scolarite/${sem.formsemestre_id}/GestionSem`, pathname: `/${window.location.href.split('/')[7]}/Scolarite/${sem.formsemestre_id}/GestionSem`,
tab: "Bulletin", tab: "Bulletin",
etudid: window.location.href.split('/')[10] etudid: window.location.href.split('/')[10],
name: this.state.etud.nomprenom
}}> }}>
<Button variant="primary" style={{"margin-left": "2px"}}>Vers bulletin</Button> <Button variant="primary" style={{"margin-left": "2px", "margin-bottom": "2px"}}>Vers bulletin</Button>
</Link> </Link>
</div> </div>
) )

20
src/ScoDoc/GestionSemestre.js
View File

@ -1,5 +1,5 @@
import React, {Component} from "react"; 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 Accueil from "./GestionSemestre/Accueil";
import Absences from "./GestionSemestre/Absences"; import Absences from "./GestionSemestre/Absences";
import Etudiants from "./GestionSemestre/Etudiants"; import Etudiants from "./GestionSemestre/Etudiants";
@ -17,7 +17,8 @@ class GestionSemestre extends Component {
id: "", id: "",
name: '', name: '',
defaulttab: "Accueil", defaulttab: "Accueil",
defaultsel: "" defaultsel: "",
loading: true
} }
} }
@ -26,7 +27,7 @@ class GestionSemestre extends Component {
if (this.props.location.tab) { if (this.props.location.tab) {
this.setState({defaulttab: this.props.location.tab, defaultsel: this.props.location.etudid, 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 // Création d'une liste pour le select
res.data.map((student) => { res.data.map((student) => {
let joined = this.state.selectOptions.concat({label: student.nom_disp + " " + student.prenom, value: student.etudid}); 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 */} {/* Selection de l'étudiant pour les sous-composants */}
<div className="col-sm" id="wrapDept"> <div className="col-sm" id="wrapDept">
Choix de l'étudiant Choix de l'étudiant
<Select className="mySelect" options={this.state.selectOptions} onChange={this.handleSelectChange.bind(this)} <Select className="mySelect"
isLoading={this.state.loading}
options={this.state.selectOptions}
onChange={this.handleSelectChange.bind(this)}
value={this.state.selectOptions.find(option => option.value === this.state.defaultsel)} /> value={this.state.selectOptions.find(option => option.value === this.state.defaultsel)} />
</div> </div>
</div> </div>
</div> </div>
<div> <div>
<Tabs defaultActiveKey={this.state.defaulttab} id="controlled-tab-example"> <Tabs fill defaultActiveKey={this.state.defaulttab} id="controlled-tab-example" variant="pills">
<Tab eventKey="Accueil" title="Accueil" > <Tab eventKey="Accueil" title="Accueil">
<Accueil /> <Accueil />
</Tab> </Tab>
<Tab eventKey="Absences" title="Absences"> <Tab eventKey="Absences" title="Absences">
<Absences id={this.state.id} name={this.state.name}/> <Absences id={this.state.id} name={this.state.name}/>
</Tab> </Tab>
<Tab eventKey="Bulletin" title="Bulletin"> <Tab eventKey="Bulletin" title="Bulletins">
<Bulletin id={this.state.id} name={this.state.name}/> <Bulletin id={this.state.id} name={this.state.name}/>
</Tab> </Tab>
<Tab eventKey="Etud" title="Etudiants"> <Tab eventKey="Etud" title="Etudiants">

2
src/ScoDoc/GestionSemestre/Etudiants.js
View File

@ -40,7 +40,7 @@ class Etudiants extends Component {
// Liste des étudiants inscrits au semestre // Liste des étudiants inscrits au semestre
students: [], students: [],
// Gestion du select // Gestion du select
selectOptions: [{label: "Filtre: Aucun", value: "Default"}], selectOptions: [{label: "Groupe: Aucun", value: "Default"}],
id: "", id: "",
name: '', name: '',
}; };