diff --git a/imports/client/app/routes.js b/imports/client/app/routes.js
index 048eee0..53b217a 100644
--- a/imports/client/app/routes.js
+++ b/imports/client/app/routes.js
@@ -26,10 +26,14 @@ import { importCsvController } from '/imports/client/views/org/impo
/**
Admin
**/
-import { StudentDataController } from '/imports/client/views/org/admin/settings/students/index'
-import { staffViewController } from '/imports/client/views/org/admin/settings/staff/index'
-import { ParentViewController } from '/imports/client/views/org/admin/settings/parents/index'
import { AdminSettingsController } from '/imports/client/views/org/admin/settings/index'
+//
+import { AdminUsersModule } from '/imports/client/views/org/admin/users/module/index'
+import { AdminUsersListController } from '/imports/client/views/org/admin/users/list/index'
+import { StudentDataController } from '/imports/client/views/org/admin/users/students/index'
+import { staffViewController } from '/imports/client/views/org/admin/users/staff/index'
+import { ParentViewController } from '/imports/client/views/org/admin/users/parents/index'
+
//Admin mail
import { AdminMailModule } from '/imports/client/views/org/admin/mailbox/module/index'
import { AdminInboxController } from '/imports/client/views/org/admin/mailbox/inbox/index'
@@ -56,20 +60,23 @@ There are three types of routes
**/
const getOrgAdminRoutes = () => (
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
)
diff --git a/imports/client/views/org/admin/settings/Header.js b/imports/client/views/org/admin/settings/Header.js
deleted file mode 100644
index 5659f97..0000000
--- a/imports/client/views/org/admin/settings/Header.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ from 'lodash';
-import { Meteor } from 'meteor/meteor';
-
-import React, { Component } from 'react';
-import { Link,browserHistory } from 'react-router';
-import { FormGroup,
- FormControl,Glyphicon,Button } from 'react-bootstrap';
-import './header.css';
-
-
-export class Header extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
-
- };
- this.onUpdate = this.onUpdate.bind(this);
- };
-
- onUpdate(key, value) {
- this.setState({[key]: value});
- };
-
- render() {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
Students
-
Click to view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Teachers
-
Click to view
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Parents
-
Click to view
-
-
-
-
-
-
-
-
- | {parent.firstName} |
- {parent.relationship} | {/* relationship doesnt reflect here */}
- Active |
-
-
- |
-
- );
- }else {
- return null;
- }
-
- };
-
- };
diff --git a/imports/client/views/org/admin/settings/parents/view/ParentTable.js b/imports/client/views/org/admin/settings/parents/view/ParentTable.js
deleted file mode 100644
index 8bf1e54..0000000
--- a/imports/client/views/org/admin/settings/parents/view/ParentTable.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import _ from 'lodash';
-import { Meteor } from 'meteor/meteor';
-
-import React, { Component } from 'react';
-import { Link,browserHistory } from 'react-router';
-import { FormGroup,Panel,Table,
- ButtonToolbar,Modal,
- FormControl,Glyphicon,Button } from 'react-bootstrap';
-import {moment} from 'meteor/momentjs:moment'
-import {ParentRow} from './ParentRow'
-import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
-const options = {
- page: 0, // which page you want to show as default
- sizePerPageList: [ {
- text: '5', value: 5
- }, {
- text: '10', value: 10
- }], // you can change the dropdown list for size per page
- sizePerPage: 5, // which size per page you want to locate as default
- pageStartIndex: 0, // where to start counting the pages
- paginationSize: 3, // the pagination bar size.
- prePage: 'Prev', // Previous page button text
- nextPage: 'Next', // Next page button text
- firstPage: 'First', // First page button text
- lastPage: 'Last', // Last page button text
- paginationShowsTotal: false, // Accept bool or function
- paginationPosition: 'bottom' // default is bottom, top and both is all available
- // hideSizePerPage: true > You can hide the dropdown for sizePerPage
- // alwaysShowAllBtns: true // Always show next and previous button
- // withFirstAndLast: false > Hide the going to First and Last page button
- };
-
-export class ParentTable extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- show: false,
- panleOpen: true,
- };
- this.onUpdate = this.onUpdate.bind(this);
- };
- onUpdate(key, value) {
- this.setState({[key]: value});
- };
-
- render() {
- return (
-
-
-
-
- Sr No
- Name
- Relationship
- Profession
-
-
-
-
- {props.currentStep === 0 && (
-
- )}
- {props.currentStep === 1 && (
-
- )}
- {props.currentStep === 2 && (
-
- )}
- {props.currentStep === 3 && (
-
- )}
-
- {props.currentStep > 0 && (
-
-
-
-
- )}
- {props.currentStep < 3 && (
-
-
-
- )}
- {props.currentStep === 3 && (
-
-
-
- )}
-
-
- | {staff.firstName} |
- {staff.lastName} |
- {staff.type} |
- {staff.dob? moment(staff.dob).format("LL") : } |
- Active |
-
-
- |
-
- );
- }else {
- return null;
- }
-
- };
-
-};
diff --git a/imports/client/views/org/admin/settings/staff/view/StaffTable.js b/imports/client/views/org/admin/settings/staff/view/StaffTable.js
deleted file mode 100644
index 357d37a..0000000
--- a/imports/client/views/org/admin/settings/staff/view/StaffTable.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ from 'lodash';
-import { Meteor } from 'meteor/meteor';
-
-import React, { Component } from 'react';
-import { Link,browserHistory } from 'react-router';
-import { FormGroup,Panel,Table,
- ButtonToolbar,Modal,
- FormControl,Glyphicon,Button } from 'react-bootstrap';
-import {moment} from 'meteor/momentjs:moment'
-import {StaffRow} from './StaffRow'
-import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
-const options = {
- page: 0, // which page you want to show as default
- sizePerPageList: [ {
- text: '5', value: 5
- }, {
- text: '10', value: 10
- }], // you can change the dropdown list for size per page
- sizePerPage: 5, // which size per page you want to locate as default
- pageStartIndex: 0, // where to start counting the pages
- paginationSize: 3, // the pagination bar size.
- prePage: 'Prev', // Previous page button text
- nextPage: 'Next', // Next page button text
- firstPage: 'First', // First page button text
- lastPage: 'Last', // Last page button text
- paginationShowsTotal: false, // Accept bool or function
- paginationPosition: 'bottom' // default is bottom, top and both is all available
- // hideSizePerPage: true > You can hide the dropdown for sizePerPage
- // alwaysShowAllBtns: true // Always show next and previous button
- // withFirstAndLast: false > Hide the going to First and Last page button
- };
-
-function dateFormatter(cell, row) {
- console.log("cell");
- console.log(cell);
- if(cell){
- cell = new Date(cell);
- console.log(cell);
- return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
- }
-}
-
-export class StaffTable extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- show: false,
- panleOpen: true,
- };
- this.onUpdate = this.onUpdate.bind(this);
- };
- onUpdate(key, value) {
- this.setState({[key]: value});
- };
- togglePanel(){
- this.setState({panleOpen: !this.state.panleOpen});
- }
- render() {
- console.log("this.props.staff");
- console.log(this.props.staff);
- return (
-
-
-
-
- Employee Id
- First Name
- Last Name
- Type
- DOB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Students
- Click to view
-
-
-
-
-
-
-
-
-
-
-
-
Teachers
- Click to view
-
-
-
-
-
-
-
-
-
-
-
-
Parents
- Click to view
-
-
-
-
-
-
-
-
-
-
-
-
Non Teaching Staff
- Click to view
-
-
-
-
-
-
-
-
-
-
-
-
-
- | First Name |
- Last Name |
- className |
- DOB |
- Status |
- Actions |
-
-
-
-
- | Marth |
- Enright |
- VII |
- 22 Jun 1972 |
- Active |
-
-
- |
-
-
- | Jackelyn |
- Weible |
- XI |
- 3 Oct 1981 |
- Inactive |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | # |
- First Name |
- Last Name |
-
-
-
- {
- this.props.data.students.map(function(student, i)
- {
- return(
-
- | {i+1} |
- {student.firstName} |
- {student.lastName} |
-
- )
- })
- }
-
-
-
-
-
-
-
- New Student
-
-
-
-
-
-
-
-
-
-
-
-
- {props.currentStep === 0 && (
-
- )}
- {props.currentStep === 1 && (
-
- )}
- {props.currentStep === 2 && (
-
- )}
- {props.currentStep === 3 && (
-
- )}
-
- {props.currentStep > 0 && (
-
-
-
-
- )}
- {props.currentStep < 3 && (
-
-
-
- )}
- {props.currentStep === 3 && (
-
-
-
- )}
-
-
- | {student.firstName} |
- {student.lastName} |
- {student.class} |
- {student.dob? moment(student.dob).format("LL") : } |
- Active |
-
-
- |
-
- );
- }else {
- return null;
- }
-
- };
-
-};
diff --git a/imports/client/views/org/admin/settings/students/view/StudentTable.js b/imports/client/views/org/admin/settings/students/view/StudentTable.js
deleted file mode 100644
index 5f331fa..0000000
--- a/imports/client/views/org/admin/settings/students/view/StudentTable.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ from 'lodash';
-import { Meteor } from 'meteor/meteor';
-
-import React, { Component } from 'react';
-import { Link,browserHistory } from 'react-router';
-import { FormGroup,Panel,Table,
- ButtonToolbar,Modal,
- FormControl,Glyphicon,Button, } from 'react-bootstrap';
-import {moment} from 'meteor/momentjs:moment'
-import {StudentRow} from './StudentRow'
-import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
-
-const options = {
- page: 0, // which page you want to show as default
- sizePerPageList: [ {
- text: '5', value: 5
- }, {
- text: '10', value: 10
- }], // you can change the dropdown list for size per page
- sizePerPage: 5, // which size per page you want to locate as default
- pageStartIndex: 0, // where to start counting the pages
- paginationSize: 3, // the pagination bar size.
- prePage: 'Prev', // Previous page button text
- nextPage: 'Next', // Next page button text
- firstPage: 'First', // First page button text
- lastPage: 'Last', // Last page button text
- paginationShowsTotal: false, // Accept bool or function
- paginationPosition: 'bottom' // default is bottom, top and both is all available
- // hideSizePerPage: true > You can hide the dropdown for sizePerPage
- // alwaysShowAllBtns: true // Always show next and previous button
- // withFirstAndLast: false > Hide the going to First and Last page button
- };
-
-function dateFormatter(cell, row) {
- if(cell){
- cell = new Date(cell);
- return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
- }
-}
-export class StudentTable extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- show: false,
- panleOpen: true,
- };
- this.onUpdate = this.onUpdate.bind(this);
- this.togglePanel = this.togglePanel.bind(this);
- };
- onUpdate(key, value) {
- this.setState({[key]: value});
- };
- togglePanel(){
- this.setState({panleOpen: !this.state.panleOpen});
- }
-
- render() {
- studentData = this.props.studentData;
- console.log("this.props.studentData");
- console.log(this.props.studentData);
- return (
-
-
-
-
- Admission Id
- First Name
- Last Name
- Class
- DOB
-
-
-
+
+
+
+
+
+
+
+
Students Click to view
+
+
+
+
+
+
+
+
+
+
+
+
Teachers Click to view
+
+
+
+
+
+
+
+
+
+
+
+
Parents Click to view
+
+
+
+
+
+
+
+ { this.props.children }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Students
+
Click to view
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Teachers
+
Click to view
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Parents
+
Click to view
+
+
+
+
+
+
+
+
+ | {parent.firstName} |
+ {parent.relationship} | {/* relationship doesnt reflect here */}
+ Active |
+
+
+ |
+
+ );
+ }else {
+ return null;
+ }
+
+ };
+
+ };
diff --git a/imports/client/views/org/admin/users/parents/view/ParentTable.js b/imports/client/views/org/admin/users/parents/view/ParentTable.js
new file mode 100644
index 0000000..8bf1e54
--- /dev/null
+++ b/imports/client/views/org/admin/users/parents/view/ParentTable.js
@@ -0,0 +1,70 @@
+import _ from 'lodash';
+import { Meteor } from 'meteor/meteor';
+
+import React, { Component } from 'react';
+import { Link,browserHistory } from 'react-router';
+import { FormGroup,Panel,Table,
+ ButtonToolbar,Modal,
+ FormControl,Glyphicon,Button } from 'react-bootstrap';
+import {moment} from 'meteor/momentjs:moment'
+import {ParentRow} from './ParentRow'
+import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
+const options = {
+ page: 0, // which page you want to show as default
+ sizePerPageList: [ {
+ text: '5', value: 5
+ }, {
+ text: '10', value: 10
+ }], // you can change the dropdown list for size per page
+ sizePerPage: 5, // which size per page you want to locate as default
+ pageStartIndex: 0, // where to start counting the pages
+ paginationSize: 3, // the pagination bar size.
+ prePage: 'Prev', // Previous page button text
+ nextPage: 'Next', // Next page button text
+ firstPage: 'First', // First page button text
+ lastPage: 'Last', // Last page button text
+ paginationShowsTotal: false, // Accept bool or function
+ paginationPosition: 'bottom' // default is bottom, top and both is all available
+ // hideSizePerPage: true > You can hide the dropdown for sizePerPage
+ // alwaysShowAllBtns: true // Always show next and previous button
+ // withFirstAndLast: false > Hide the going to First and Last page button
+ };
+
+export class ParentTable extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ show: false,
+ panleOpen: true,
+ };
+ this.onUpdate = this.onUpdate.bind(this);
+ };
+ onUpdate(key, value) {
+ this.setState({[key]: value});
+ };
+
+ render() {
+ return (
+
+
+
+
+ Sr No
+ Name
+ Relationship
+ Profession
+
+
+
+
+ {props.currentStep === 0 && (
+
+ )}
+ {props.currentStep === 1 && (
+
+ )}
+ {props.currentStep === 2 && (
+
+ )}
+ {props.currentStep === 3 && (
+
+ )}
+
+ {props.currentStep > 0 && (
+
+
+
+
+ )}
+ {props.currentStep < 3 && (
+
+
+
+ )}
+ {props.currentStep === 3 && (
+
+
+
+ )}
+
+
+ | {staff.firstName} |
+ {staff.lastName} |
+ {staff.type} |
+ {staff.dob? moment(staff.dob).format("LL") : } |
+ Active |
+
+
+ |
+
+ );
+ }else {
+ return null;
+ }
+
+ };
+
+};
diff --git a/imports/client/views/org/admin/users/staff/view/StaffTable.js b/imports/client/views/org/admin/users/staff/view/StaffTable.js
new file mode 100644
index 0000000..357d37a
--- /dev/null
+++ b/imports/client/views/org/admin/users/staff/view/StaffTable.js
@@ -0,0 +1,85 @@
+import _ from 'lodash';
+import { Meteor } from 'meteor/meteor';
+
+import React, { Component } from 'react';
+import { Link,browserHistory } from 'react-router';
+import { FormGroup,Panel,Table,
+ ButtonToolbar,Modal,
+ FormControl,Glyphicon,Button } from 'react-bootstrap';
+import {moment} from 'meteor/momentjs:moment'
+import {StaffRow} from './StaffRow'
+import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
+const options = {
+ page: 0, // which page you want to show as default
+ sizePerPageList: [ {
+ text: '5', value: 5
+ }, {
+ text: '10', value: 10
+ }], // you can change the dropdown list for size per page
+ sizePerPage: 5, // which size per page you want to locate as default
+ pageStartIndex: 0, // where to start counting the pages
+ paginationSize: 3, // the pagination bar size.
+ prePage: 'Prev', // Previous page button text
+ nextPage: 'Next', // Next page button text
+ firstPage: 'First', // First page button text
+ lastPage: 'Last', // Last page button text
+ paginationShowsTotal: false, // Accept bool or function
+ paginationPosition: 'bottom' // default is bottom, top and both is all available
+ // hideSizePerPage: true > You can hide the dropdown for sizePerPage
+ // alwaysShowAllBtns: true // Always show next and previous button
+ // withFirstAndLast: false > Hide the going to First and Last page button
+ };
+
+function dateFormatter(cell, row) {
+ console.log("cell");
+ console.log(cell);
+ if(cell){
+ cell = new Date(cell);
+ console.log(cell);
+ return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
+ }
+}
+
+export class StaffTable extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ show: false,
+ panleOpen: true,
+ };
+ this.onUpdate = this.onUpdate.bind(this);
+ };
+ onUpdate(key, value) {
+ this.setState({[key]: value});
+ };
+ togglePanel(){
+ this.setState({panleOpen: !this.state.panleOpen});
+ }
+ render() {
+ console.log("this.props.staff");
+ console.log(this.props.staff);
+ return (
+
+
+
+
+ Employee Id
+ First Name
+ Last Name
+ Type
+ DOB
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Students
+ Click to view
+
+
+
+
+
+
+
+
+
+
+
+
Teachers
+ Click to view
+
+
+
+
+
+
+
+
+
+
+
+
Parents
+ Click to view
+
+
+
+
+
+
+
+
+
+
+
+
Non Teaching Staff
+ Click to view
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | First Name |
+ Last Name |
+ className |
+ DOB |
+ Status |
+ Actions |
+
+
+
+
+ | Marth |
+ Enright |
+ VII |
+ 22 Jun 1972 |
+ Active |
+
+
+ |
+
+
+ | Jackelyn |
+ Weible |
+ XI |
+ 3 Oct 1981 |
+ Inactive |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | # |
+ First Name |
+ Last Name |
+
+
+
+ {
+ this.props.data.students.map(function(student, i)
+ {
+ return(
+
+ | {i+1} |
+ {student.firstName} |
+ {student.lastName} |
+
+ )
+ })
+ }
+
+
+
+
+
+
+
+ New Student
+
+
+
+
+
+
+
+
+
+
+
+
+ {props.currentStep === 0 && (
+
+ )}
+ {props.currentStep === 1 && (
+
+ )}
+ {props.currentStep === 2 && (
+
+ )}
+ {props.currentStep === 3 && (
+
+ )}
+
+ {props.currentStep > 0 && (
+
+
+
+
+ )}
+ {props.currentStep < 3 && (
+
+
+
+ )}
+ {props.currentStep === 3 && (
+
+
+
+ )}
+
+
+ | {student.firstName} |
+ {student.lastName} |
+ {student.class} |
+ {student.dob? moment(student.dob).format("LL") : } |
+ Active |
+
+
+ |
+
+ );
+ }else {
+ return null;
+ }
+
+ };
+
+};
diff --git a/imports/client/views/org/admin/users/students/view/StudentTable.js b/imports/client/views/org/admin/users/students/view/StudentTable.js
new file mode 100644
index 0000000..5f331fa
--- /dev/null
+++ b/imports/client/views/org/admin/users/students/view/StudentTable.js
@@ -0,0 +1,85 @@
+import _ from 'lodash';
+import { Meteor } from 'meteor/meteor';
+
+import React, { Component } from 'react';
+import { Link,browserHistory } from 'react-router';
+import { FormGroup,Panel,Table,
+ ButtonToolbar,Modal,
+ FormControl,Glyphicon,Button, } from 'react-bootstrap';
+import {moment} from 'meteor/momentjs:moment'
+import {StudentRow} from './StudentRow'
+import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
+
+const options = {
+ page: 0, // which page you want to show as default
+ sizePerPageList: [ {
+ text: '5', value: 5
+ }, {
+ text: '10', value: 10
+ }], // you can change the dropdown list for size per page
+ sizePerPage: 5, // which size per page you want to locate as default
+ pageStartIndex: 0, // where to start counting the pages
+ paginationSize: 3, // the pagination bar size.
+ prePage: 'Prev', // Previous page button text
+ nextPage: 'Next', // Next page button text
+ firstPage: 'First', // First page button text
+ lastPage: 'Last', // Last page button text
+ paginationShowsTotal: false, // Accept bool or function
+ paginationPosition: 'bottom' // default is bottom, top and both is all available
+ // hideSizePerPage: true > You can hide the dropdown for sizePerPage
+ // alwaysShowAllBtns: true // Always show next and previous button
+ // withFirstAndLast: false > Hide the going to First and Last page button
+ };
+
+function dateFormatter(cell, row) {
+ if(cell){
+ cell = new Date(cell);
+ return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
+ }
+}
+export class StudentTable extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ show: false,
+ panleOpen: true,
+ };
+ this.onUpdate = this.onUpdate.bind(this);
+ this.togglePanel = this.togglePanel.bind(this);
+ };
+ onUpdate(key, value) {
+ this.setState({[key]: value});
+ };
+ togglePanel(){
+ this.setState({panleOpen: !this.state.panleOpen});
+ }
+
+ render() {
+ studentData = this.props.studentData;
+ console.log("this.props.studentData");
+ console.log(this.props.studentData);
+ return (
+
+
+
+
+ Admission Id
+ First Name
+ Last Name
+ Class
+ DOB
+
+
+
- 
-