Sunny Negi / Meteor-projects

Browse Code »

Commit 0884c5d7d9d6c3acca0c971efe8bdc5a7b7d6ef7

Authored by ajaiprakash 2017-04-06 17:58:43 -0400

2 parents 8ed9d9dc53 ea4d73d090

Exists in master

Merge branch 'master' of https://bitbucket.org/youngdesk/ydapp

Showing 3 changed files Show diff stats

imports/client/views/org/admin/students/index.js

Diff comments View file @0884c5d

 // import { StudentDataController }            from '/imports/client/views/org/admin/students/index'
 import _                                  from 'lodash';
 import {
          composeWithTracker,
          compose,
          composeAll
        }                                  from 'react-komposer';
 import { Loading }                        from '/imports/client/components/Loading';
 import { Orgs }                           from '/imports/collections/orgs/index';
 import { Users }                          from '/imports/collections/users/index';
 import { StudentView }                    from './StudentView';
 import { Students }                       from '/imports/collections/students/index';
 const meteorTick = (props, onData) => {
   const handles = [
     Meteor.subscribe('users.current'),
     Meteor.subscribe('orgs.current'),
     Meteor.subscribe('users.forMyOrg'),
     Meteor.subscribe('student.forMyOrg'),
   ];
   if(_.every(handles, (handle) => (handle.ready()) )) {
     const user = Users.current();
     const org = Orgs.current();
     students = Users.find({"role":"STUDENT"}).fetch() ? Users.find({"role":"STUDENT"}).fetch() : "";
     console.log(students);
     studentData = Students.find().fetch() ? Students.find().fetch() : "";
+    var mergedData;
+    console.log(studentData);
     for(var i=0; i< students.length; i++){
       for(var j=0; j< studentData.length; j++){
-        if(students[i]._id == studentData[j].userId){
+        if(students[i]._id == studentData[j].userId && studentData[j].admissionId){
+          students[i].admissionId = studentData[j].admissionId;
           students[i].class = studentData[j].class;
           students[i].dob = studentData[j].dob;
         }
       }
     }
     onData(null, {
       data: {
         user:         user,
         org:          org,
         students:     students,
         studentData:  studentData
       },
     });
   }
   return () => {
     _.each(handles, (handle) => handle.stop() );
   };
 };
 const reduxTick = (props, onData) => {
   onData(null, {
     data: {}
   });
 };
 export const StudentDataController = composeAll(
   composeWithTracker(meteorTick, Loading),
   compose(reduxTick, Loading),
 )(StudentView);

imports/client/views/org/admin/students/view/StudentTable.js

Diff comments View file @0884c5d

1	import _ from 'lodash';	1	import _ from 'lodash';
2	import { Meteor } from 'meteor/meteor';	2	import { Meteor } from 'meteor/meteor';
3		3
4	import React, { Component } from 'react';	4	import React, { Component } from 'react';
5	import { Link,browserHistory } from 'react-router';	5	import { Link,browserHistory } from 'react-router';
6	import { FormGroup,Panel,Table,	6	import { FormGroup,Panel,Table,
7	ButtonToolbar,Modal,	7	ButtonToolbar,Modal,
8	FormControl,Glyphicon,Button, } from 'react-bootstrap';	8	FormControl,Glyphicon,Button, } from 'react-bootstrap';
9	import {moment} from 'meteor/momentjs:moment'	9	import {moment} from 'meteor/momentjs:moment'
10	import {StudentRow} from './StudentRow'	10	import {StudentRow} from './StudentRow'
		11	import {BootstrapTable, TableHeaderColumn}from 'react-bootstrap-table';
11		12
		13	const options = {
		14	page: 0, // which page you want to show as default
		15	sizePerPageList: [ {
		16	text: '5', value: 5
		17	}, {
		18	text: '10', value: 10
		19	}], // you can change the dropdown list for size per page
		20	sizePerPage: 5, // which size per page you want to locate as default
		21	pageStartIndex: 0, // where to start counting the pages
		22	paginationSize: 3, // the pagination bar size.
		23	prePage: 'Prev', // Previous page button text
		24	nextPage: 'Next', // Next page button text
		25	firstPage: 'First', // First page button text
		26	lastPage: 'Last', // Last page button text
		27	paginationShowsTotal: false, // Accept bool or function
		28	paginationPosition: 'bottom' // default is bottom, top and both is all available
		29	// hideSizePerPage: true > You can hide the dropdown for sizePerPage
		30	// alwaysShowAllBtns: true // Always show next and previous button
		31	// withFirstAndLast: false > Hide the going to First and Last page button
		32	};
		33
		34	function dateFormatter(cell, row) {
		35	if(cell){
		36	console.log(cell);
		37	return `${('0' + cell.getDate()).slice(-2)}/${('0' + (cell.getMonth() + 1)).slice(-2)}/${cell.getFullYear()}`;
		38	}
		39
		40	}
12	export class StudentTable extends Component {	41	export class StudentTable extends Component {
13		42
14	constructor(props) {	43	constructor(props) {
15	super(props);	44	super(props);
16	this.state = {	45	this.state = {
17	show: false,	46	show: false,
18	panleOpen: true,	47	panleOpen: true,
19	};	48	};
20	this.onUpdate = this.onUpdate.bind(this);	49	this.onUpdate = this.onUpdate.bind(this);
21	this.togglePanel = this.togglePanel.bind(this);	50	this.togglePanel = this.togglePanel.bind(this);
22	};	51	};
23	onUpdate(key, value) {	52	onUpdate(key, value) {
24	this.setState({[key]: value});	53	this.setState({[key]: value});
25	};	54	};
26	togglePanel(){	55	togglePanel(){
27	this.setState({panleOpen: !this.state.panleOpen});	56	this.setState({panleOpen: !this.state.panleOpen});
28	}	57	}
		58
29	render() {	59	render() {
30	return (	60	return (
31	<div className="panel panel-flat">	61	<div className="panel panel-flat">
32	<div className="panel-heading">	62	<div className="panel-heading">
33	<h5 className="panel-title">Student Details</h5>	63	<h5 className="panel-title">Student Details</h5>
34	<div className="heading-elements">	64	<div className="heading-elements">
35	<ul className="icons-list">	65	<ul className="icons-list">
36	<li onClick={this.togglePanel}><a data-action="collapse" className={this.state.panleOpen?"rotate-180":null}></a></li>	66	<li onClick={this.togglePanel}><a data-action="collapse" className={this.state.panleOpen?"rotate-180":null}></a></li>
37	</ul>	67	</ul>
38	</div>	68	</div>
39	</div>	69	</div>
40	<Panel collapsible expanded={this.state.panleOpen}>	70	<Panel collapsible expanded={this.state.panleOpen}>
41	<Table striped bordered condensed hover>	71	<BootstrapTable data={ this.props.students } pagination={ true } options={ options } >
42	<thead>	72	<TableHeaderColumn dataField='admissionId' isKey={ true } dataSort={ true }>Admission Id</TableHeaderColumn>
43	<tr>	73	<TableHeaderColumn dataField='firstName' dataSort={ true }>First Name</TableHeaderColumn>
44	<th>First Name</th>	74	<TableHeaderColumn dataField='lastName' dataSort={ true }>Last Name</TableHeaderColumn>
45	<th>Last Name</th>	75	<TableHeaderColumn dataField='class' dataSort={ true }>Class</TableHeaderColumn>
46	<th>Class</th>	76	<TableHeaderColumn dataField='dob' filter={ { type: 'DateFilter' } }>DOB</TableHeaderColumn>
47	<th>DOB</th>	77	</BootstrapTable>
48	<th>Status</th>	78
49	<th className="text-center">Actions</th>
50	</tr>
51	</thead>
52	<tbody>
53	{
54	this.props.students.map(function(student, i)
55	{

package.json

Diff comments View file @0884c5d

 {
   "name": "application-name",
   "version": "1.0.0",
   "description": "Application description.",
   "scripts": {
     "start": "meteor --settings settings-development.json",
     "test": "meteor test --driver-package practicalmeteor:mocha --port 5000",
     "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests",
     "chimp-test": "chimp --ddp=http://localhost:3000 --mocha --path=tests",
     "staging": "meteor deploy staging.meteor.com --settings settings-development.json",
     "production": "meteor deploy production.meteor.com --settings settings-production.json"
   },
   "devDependencies": {
     "chimp": "^0.41.2",
     "eslint": "^3.8.1",
     "eslint-config-airbnb": "^12.0.0",
     "eslint-plugin-import": "^1.16.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
     "eslint-plugin-meteor": "^4.0.1",
     "eslint-plugin-react": "^6.4.1"
   },
   "eslintConfig": {
     "parserOptions": {
       "ecmaFeatures": {
         "jsx": true
       }
     },
     "plugins": [
       "meteor",
       "react"
     ],
     "extends": [
       "airbnb/base",
       "plugin:meteor/guide",
       "plugin:react/recommended"
     ],
     "env": {
       "browser": true
     },
     "globals": {
       "server": false,
       "browser": false,
       "expect": false
     },
     "rules": {
       "import/no-unresolved": 0,
       "import/no-extraneous-dependencies": 0,
       "import/extensions": 0,
       "no-underscore-dangle": [
         "error",
         {
           "allow": [
             "_id",
             "_ensureIndex",
             "_verifyEmailToken",
             "_resetPasswordToken",
             "_name"
           ]
         }
       ],
       "class-methods-use-this": 0
     }
   },
   "dependencies": {
     "babel-runtime": "^6.18.0",
     "babyparse": "^0.4.6",
     "bcrypt": "^0.8.7",
     "bootstrap": "^4.0.0-alpha.6",
     "csv2json-convertor": "^1.2.0",
     "csvtojson": "^1.1.4",
     "fs": "0.0.1-security",
     "jquery": "^2.2.4",
     "jquery-ui": "^1.12.1",
     "jquery-validation": "^1.15.1",
     "json2csv": "^3.7.3",
     "lodash": "^4.17.4",
-    "material-fabmenu": "0.0.1",
     "material-ui": "^0.17.1",
     "meteor-node-stubs": "^0.2.6",
     "moment": "^2.18.0",
     "react": "^15.4.2",
     "react-addons-css-transition-group": "^15.4.2",
     "react-addons-pure-render-mixin": "^15.3.2",
     "react-addons-transition-group": "^15.4.2",
     "react-bootstrap": "^0.30.8",
     "react-bootstrap-date-picker": "^4.0.0",
+    "react-bootstrap-table": "^3.1.6",
     "react-burger-menu": "^1.10.14",
     "react-dom": "^15.4.2",
     "react-fontawesome": "^1.5.0",
     "react-komposer": "^1.13.1",
     "react-router": "^2.6.1",
     "react-router-bootstrap": "^0.23.1",
     "react-stepzilla": "^4.3.4",
     "react-svg": "^2.1.19",
     "react-tap-event-plugin": "^2.0.1",
     "reactstrap": "^4.3.0",
     "velocity-animate": "^1.4.3",
     "velocity-react": "^1.2.1"
   }
 }