Skip to content

Commit 76ab589

Browse files
committed
all students present by default
1 parent 12a4b08 commit 76ab589

File tree

3 files changed

+14
-42
lines changed

3 files changed

+14
-42
lines changed

app/config/keys.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const dbURI = 'mongodb://archisbhoir:Archi%40123321@ds351807.mlab.com:51807/nitmoi'
1+
const dbURI = 'mongodb://localhost:27017/nitmoi'
22
const SECRET = 'fdshgchsbfojsd153456ds4fndsjbvjkdsda4sfdfgf564sd56v4f';
33
module.exports = {dbURI, SECRET}
44

client/src/components/attendance/Attendance.js

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ export default class AddAttendance extends Component {
5959
this.state = {
6060
students: [], date: new Date(),
6161
viewDate: new Date(), checked: false,
62-
present: [], viewVisible: false,
63-
addVisible: false, presentStuds: [],
62+
present: [], presentStuds: [],
6463
errors: [], modalIsOpen: false,
6564
alertModalIsOpen: false, successModalIsOpen: false,
6665
loading: false
@@ -90,29 +89,28 @@ export default class AddAttendance extends Component {
9089
}
9190
return res.json()
9291
}).then(resdata => {
93-
this.setState({ students: resdata, errors: [], loading: false })
92+
this.setState({ students: resdata, present:resdata, errors: [], loading: false },()=>{
93+
console.log(this.state.present)
94+
})
9495
}).catch(err => {
9596
console.log(err)
9697
this.setState({ loading: false })
9798
})
9899
}
99100

100101
handleCheckboxChange = (student) => {
101-
if (this.state.present.indexOf(student) === -1) {
102-
this.setState({ present: [...this.state.present, student] },()=>{
103-
console.log(this.state.present)
104-
})
105-
}
102+
let arr = this.state.present.filter(item => item !== student)
103+
this.setState({ present: arr })
106104
}
107105

108-
clearListItem = (stud) => {
109-
let arr = this.state.present.filter(item => item !== stud)
110-
this.setState({ present: arr })
106+
clearListItem = (student) => {
107+
if (this.state.present.indexOf(student) === -1) {
108+
this.setState({ present: [...this.state.present, student] })
109+
}
111110
}
112111

113112
handleFormSubmit = e => {
114113
e.preventDefault();
115-
console.log(this.state.present)
116114
const attendanceRequest = {
117115
"date": this.state.date.toLocaleDateString(),
118116
"present": this.state.present
@@ -168,19 +166,6 @@ export default class AddAttendance extends Component {
168166
this.setState({ successModalIsOpen: true })
169167
}
170168

171-
toggleView = () => {
172-
this.setState({ viewVisible: !this.state.viewVisible })
173-
if (this.state.addVisible) {
174-
this.setState({ addVisible: false })
175-
}
176-
}
177-
178-
toggleAdd = () => {
179-
this.setState({ addVisible: !this.state.addVisible })
180-
if (this.state.viewVisible) {
181-
this.setState({ viewVisible: false })
182-
}
183-
}
184169

185170
getAttendanceByDate = (e) => {
186171
e.preventDefault();
@@ -221,7 +206,7 @@ export default class AddAttendance extends Component {
221206

222207
render() {
223208
const listItem = this.state.students.map(stud => (
224-
<Checkbox key={stud._id} stud={stud} handleChange={this.handleCheckboxChange} clearList={this.clearListItem} />
209+
<Checkbox key={stud._id} stud={stud} checked={true} handleChange={this.handleCheckboxChange} clearList={this.clearListItem} />
225210
))
226211
return (this.state.loading) ? <MyLoader loading={this.state.loading} /> :
227212
<div className="container bg-light mt-5">
@@ -251,18 +236,6 @@ export default class AddAttendance extends Component {
251236
<h4 className='selected-date'>Selected Date {this.state.viewDate.toDateString()}</h4>
252237
<button type="submit" className="btn btn-primary" onClick={this.getAttendanceByDate}>Find Attendance</button>
253238
{this.state.errors.length === 0 && this.state.presentStuds.map((stud, i) => <div key={i} className='border' style={{ margin: '20px auto' }}>
254-
{/* <Student key={i}
255-
fName={stud.firstName}
256-
lName={stud.lastName}
257-
Std={stud.standard}
258-
Addr={stud.Address}
259-
brd={stud.Board}
260-
phy={stud.lastYearmarks.physics}
261-
eng={stud.lastYearmarks.english}
262-
maths={stud.lastYearmarks.maths}
263-
sex={stud.sex}
264-
fees={stud.fees.total}
265-
/> */}
266239
<h4>{stud.firstName} {stud.lastName}</h4>
267240
</div>)}
268241
</div>

client/src/components/attendance/Checkbox.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ export default class Checkbox extends Component {
44
constructor(props) {
55
super(props);
66
this.state = {
7-
checked: false
7+
checked: props.checked
88
}
99
}
1010

1111
handleClick = (e) => {
12-
console.log(this.props)
1312
const { handleChange, stud, clearList } = this.props;
1413
this.setState({ checked: !this.state.checked },()=>{
15-
if (this.state.checked) {
14+
if (!this.state.checked) {
1615
handleChange(stud)
1716
} else {
1817
clearList(stud)

0 commit comments

Comments
 (0)