Added Middle Name

archies-coder · archies-coder · commit 1836487ca79e · 2019-09-09T20:46:38.000+05:30
diff --git a/app/config/keys.js b/app/config/keys.js
@@ -2,6 +2,6 @@ const dbURI = 'mongodb://archisbhoir:Archi%40123321@ds351807.mlab.com:51807/nitm
 const SECRET = 'fdshgchsbfojsd153456ds4fndsjbvjkdsda4sfdfgf564sd56v4f';
 module.exports = {dbURI, SECRET}
 
-//'mongodb://archisbhoir:Archi%40123321@ds351807.mlab.com:51807/nitmoi' 
+//'mongodb://archisbhoir:Archi%40123321@ds351807.mlab.com:51807/nitmoi'
 //  'mongodb://localhost:27017/nitmoi'
 // 'mongodb+srv://archisbhoir:Archi%40123321@cluster0-hn5mn.mongodb.net/test?retryWrites=true&w=majority'
diff --git a/app/models/student.model.js b/app/models/student.model.js
@@ -1,37 +1,43 @@
 const mongoose = require('mongoose')
 
 const StudentSchema = new mongoose.Schema({
-    firstName: {
-      type: String,
-      require: [true, 'name required mann!!']
-    },
-    lastName: {
-      type: String,
-      require: [true, 'name required mann!!']
-    },
-    Address: String,
-    standard: {
-        type: Number,
-        require: [true, 'std required mann!!']
-    },
-    Board: String,
-    joinedOn: Date,
-    lastYearmarks: {
-      physics: Number,
-      english: Number,
-      maths: Number
-    },
-    sex: String,
-    fees: {
-      total: Number,
-      installments: [{
-          date: {
-              type: Date,
-          },
-          amount: Number
-      }], 
-    }
-  });
+  firstName: {
+    type: String,
+    require: [true, 'name required mann!!']
+  },
+  middleName: {
+    type: String,
+  },
+  lastName: {
+    type: String,
+    require: [true, 'name required mann!!']
+  },
+  Address: {
+    type: String,
+    require: [true, 'name required mann!!']
+  },
+  standard: {
+    type: Number,
+    require: [true, 'std required mann!!']
+  },
+  Board: String,
+  joinedOn: Date,
+  lastYearmarks: {
+    physics: Number,
+    english: Number,
+    maths: Number
+  },
+  sex: String,
+  fees: {
+    total: Number,
+    installments: [{
+      date: {
+        type: Date,
+      },
+      amount: Number
+    }],
+  }
+});
 
 
 
diff --git a/client/.gitignore b/client/.gitignore
@@ -1,5 +1,6 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+
 # dependencies
 /node_modules
 /.pnp
diff --git a/client/src/components/add-student/AddStudent.js b/client/src/components/add-student/AddStudent.js
@@ -19,7 +19,7 @@ const customStyles = {
 export default class AddStudent extends Component {
     constructor() {
         super()
-        this.firstNameEl = React.createRef(); this.lastNameEl = React.createRef();
+        this.firstNameEl = React.createRef(); this.middleNameEl = React.createRef(); this.lastNameEl = React.createRef();
         this.addressEl = React.createRef(); this.standardEl = React.createRef();
         this.boardEl = React.createRef(); this.physicsEl = React.createRef();
         this.englishEl = React.createRef(); this.mathsEl = React.createRef();
@@ -49,6 +49,7 @@ export default class AddStudent extends Component {
         e.preventDefault();
         this.setState({ loading: true })
         const fName = this.firstNameEl.current.value;
+        const mName = this.firstNameEl.current.value;
         const lName = this.lastNameEl.current.value;
         const std = this.standardEl.current.value;
         const addr = this.addressEl.current.value;
@@ -60,7 +61,7 @@ export default class AddStudent extends Component {
         const fees = this.feesEl.current.value;
 
         const addStudentRequest = {
-            "firstName": fName, "lastName": lName,
+            "firstName": fName, "middleName": mName, "lastName": lName,
             "Address": addr, "standard": std,
             "Board": brd,
             "lastYearmarks": {
@@ -105,15 +106,15 @@ export default class AddStudent extends Component {
         return (this.state.loading) ? <MyLoader loading={this.state.loading} /> :
             <AuthContext.Consumer>
                 {context => (
-                    <div className="d-lg-flex border justify-content-center p-3">
+                    <div className="d-lg-flex justify-content-center p-3">
                         <h3>Add New Student</h3>
-                        <form onSubmit={this.handleAddForm}>
+                        <form className="py-3" onSubmit={this.handleAddForm}>
                             <div className="row py-3">
                                 <div className="col">
                                     <input type="text" ref={this.firstNameEl} className="form-control" placeholder="First name" required />
                                 </div>
                                 <div className="col">
-                                    <input type="text" className="form-control" placeholder="Middle name" />
+                                    <input type="text" ref={this.middleNameEl} className="form-control" placeholder="Middle name" />
                                 </div>
                                 <div className="col">
                                     <input type="text" ref={this.lastNameEl} className="form-control" placeholder="Last name" required />
diff --git a/client/src/components/fees/Fee.js b/client/src/components/fees/Fee.js
@@ -1,17 +1,17 @@
-import React, {useEffect, useState} from 'react'
+import React, { useEffect, useState } from 'react'
 import './fees.css'
 import Modal from 'react-modal'
 import MyCalendar from '../reusables/Calendar'
 import MyLoader from '../reusables/MyLoader'
 
 const customStyles = {
-    content : {
-      top                   : '50%',
-      left                  : '50%',
-      right                 : 'auto',
-      bottom                : 'auto',
-      marginRight           : '-50%',
-      transform             : 'translate(-50%, -50%)'
+    content: {
+        top: '50%',
+        left: '50%',
+        right: 'auto',
+        bottom: 'auto',
+        marginRight: '-50%',
+        transform: 'translate(-50%, -50%)'
     }
 };
 
@@ -22,49 +22,49 @@ const Fee = (props) => {
     const [date, setDate] = useState(new Date())
     const [amount, setAmount] = useState(Number)
     const [dateModalOpen, setDateModalOpen] = useState(false)
-    
-    useEffect(()=> getStudents(),[])
 
-    const getStudents = ()=>{
+    useEffect(() => getStudents(), [])
+
+    const getStudents = () => {
         setLoading(true)
-        fetch('/api/students',{
+        fetch('/api/students', {
             method: 'GET',
             mode: 'cors',
             headers: {
                 'Content-Type': 'application/json'
             }
         })
-        .then(res => {
-            if (res.status !== 200 && res.status !== 201) {
-                if(res.status === 401){
-                    setLoading(false)
-                    props.history.push('/login')
-                }
-                if(res.status === 404){
+            .then(res => {
+                if (res.status !== 200 && res.status !== 201) {
+                    if (res.status === 401) {
+                        setLoading(false)
+                        props.history.push('/login')
+                    }
+                    if (res.status === 404) {
+                        setLoading(false)
+                        return <h4>Not Found !!</h4>
+                    }
                     setLoading(false)
-                    return <h4>Not Found !!</h4>
+                    throw new Error(res.status)
                 }
+                return res.json()
+            })
+            .then(resdata => {
                 setLoading(false)
-                throw new Error(res.status)
-            }
-              return res.json()
-        })
-        .then(resdata => {  
-            setLoading(false)       
-            setStudents(resdata)
-        })
-        .catch(err => {
-            console.log(err)
-            setLoading(false)
-        })
+                setStudents(resdata)
+            })
+            .catch(err => {
+                console.log(err)
+                setLoading(false)
+            })
     }
 
     const selectStudent = (obj, e) => {
         e.preventDefault();
         setSelectedStudent(obj)
     }
 
-    const isEmpty = (obj) =>  {
+    const isEmpty = (obj) => {
         for (var key in obj) {
             if (hasOwnProperty.call(obj, key)) return false
         }
@@ -90,107 +90,107 @@ const Fee = (props) => {
             "date": date,
             "amount": amount
         }
-        fetch('/api/fee/installment/'+ selectedStudent._id,{
-            method: 'PUT' ,
+        fetch('/api/fee/installment/' + selectedStudent._id, {
+            method: 'PUT',
             mode: 'cors',
             headers: {
                 'content-type': 'application/json'
             },
             body: JSON.stringify(body)
         })
-        .then(res=>{
-            if (res.status !== 200 && res.status !== 201) {
-                if(res.status === 401){
+            .then(res => {
+                if (res.status !== 200 && res.status !== 201) {
+                    if (res.status === 401) {
+                        setLoading(false)
+                        props.history.push('/login')
+                    }
+                    if (res.status === 404) {
+                        setLoading(false)
+                        return <h4>Not Found !!</h4>
+                    }
                     setLoading(false)
-                    props.history.push('/login')
-                }
-                if(res.status === 404){
-                    setLoading(false)
-                    return <h4>Not Found !!</h4>
+                    throw new Error(res.status)
                 }
+                return res.json();
+            })
+            .then(data => {
                 setLoading(false)
-                throw new Error(res.status)
-            }
-            return res.json();
-        })
-        .then(data=>{
-            setLoading(false)
-            getStudents()
-            setSelectedStudent(data)
-        })
-        .catch(err=>{
-            console.log(err)
-            setLoading(false)
-        })
+                getStudents()
+                setSelectedStudent(data)
+            })
+            .catch(err => {
+                console.log(err)
+                setLoading(false)
+            })
     }
-    
-    const remainingFees = ()=>{
-        const {total, installments} = selectedStudent.fees;
+
+    const remainingFees = () => {
+        const { total, installments } = selectedStudent.fees;
         let temp = total;
         installments.map(inst => (temp = temp - inst.amount))
         return <h6>{temp}</h6>
     }
-    
-    const {fees} = selectedStudent;
+
+    const { fees } = selectedStudent;
 
     return (loading) ?
-            <MyLoader loading={loading} />:
+        <MyLoader loading={loading} /> :
         <div className="container">
             <h1 className='main-heading'>Fees</h1>
             <div className="row">
                 <div className="col-md-4">
                     <table className="table table-dark">
-                        <thead onClick={e=> setSelectedStudent({})}>
+                        <thead onClick={e => setSelectedStudent({})}>
                             <tr>
                                 <th scope='col'>#</th>
                                 <th scope='col'>Student</th>
                             </tr>
                         </thead>
                         <tbody>
-                        {
-                            students.sort((a,b)=> {return a.standard-b.standard}).map((stud, i)=>(
-                                <tr key={i} onClick={e=>selectStudent(stud,e)}>
-                                    <th scope='row'>{i}</th>
-                                    <td>{stud.firstName} {stud.lastName}</td>
-                                </tr>
-                            ))
-                        }
+                            {
+                                students.sort((a, b) => { return a.standard - b.standard }).map((stud, i) => (
+                                    <tr key={i} onClick={e => selectStudent(stud, e)}>
+                                        <th scope='row'>{i}</th>
+                                        <td>{stud.firstName} {stud.lastName}</td>
+                                    </tr>
+                                ))
+                            }
                         </tbody>
                     </table>
                 </div>
                 {!isEmpty(selectedStudent) && <div className="col bg-dark text-white pt-3 fees">
                     <div className="col-md total">
                         <h5>Total Fees</h5>
-                        <hr className='border'/>                    
+                        <hr className='border' />
                         {!isEmpty(selectedStudent) && <h6>{fees.total}</h6>}
                     </div>
                     <div className="col rem">
                         <h5>Remaining Fees</h5>
-                        <hr className='border'/>                                        
+                        <hr className='border' />
                         {!isEmpty(selectedStudent) && <span>{remainingFees()}</span>}
                     </div>
                 </div>}
                 <div className="h-100 border"></div>
                 {!isEmpty(selectedStudent) && <div className="col-md bg-dark text-white pt-3 fees">
                     <div className="col paid">
                         <h5>Installments Paid</h5>
-                        <hr className='border'/>                    
+                        <hr className='border' />
                         {!isEmpty(selectedStudent) && <h6>{fees.installments
-                            .map((inst,i)=> <div key={i}>{inst.amount}</div>)}</h6>}
+                            .map((inst, i) => <div key={i}>{inst.amount}</div>)}</h6>}
                     </div>
 
                     <div className="col new">
                         <h5>Add Installment</h5>
-                        <hr className='border'/>                    
+                        <hr className='border' />
                         <form onSubmit={handleSubmit}>
                             <div className="form-group">
                                 <label htmlFor="installment">Amount</label>
-                                <input type="tel" onChange={e=> setAmount(e.target.value)} className='form-control form-control-sm' name="installment" required/>
+                                <input type="tel" onChange={e => setAmount(e.target.value)} className='form-control form-control-sm' name="installment" required />
                                 <label htmlFor="date">Date</label>
                                 <i className="far fa-calendar-alt btn-lg" id="date" onClick={openModal}></i>
                                 <p>Selected Date:- {date.toLocaleString('en-IN').split(',')[0]}</p>
                             </div>
-                            <input type="submit" className='btn btn-sm btn-light mt-3' value="Add Installment"/>
+                            <input type="submit" className='btn btn-sm btn-light mt-3' value="Add Installment" />
                         </form>
                     </div>
                 </div>}
diff --git a/client/src/index.js b/client/src/index.js
