- | {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/students/add/AddStudentFormContainer.js b/imports/client/views/org/admin/students/add/AddStudentFormContainer.js
index 85ef828..3209ba8 100644
--- a/imports/client/views/org/admin/students/add/AddStudentFormContainer.js
+++ b/imports/client/views/org/admin/students/add/AddStudentFormContainer.js
@@ -29,7 +29,7 @@ export class AddStudentFormContainer extends Component {
handleSubmit() {
if (this.state.currentStep === 3) {
- addStudentManually.call(this.form.state.values)
+ addStudentManually.call(this.form.state.values);
}
}
diff --git a/imports/collections/staff/index.js b/imports/collections/staff/index.js
index b08146a..e832581 100644
--- a/imports/collections/staff/index.js
+++ b/imports/collections/staff/index.js
@@ -63,8 +63,17 @@ Staffs.deny({
Staffs.schema = new SimpleSchema({
userId: { type: String },
orgId: { type: String },
+ employeeId: { type: String },
+ martialStatus: { type: String },
+ dob: { type: String },
+ teaching: { type: String },
type: { type: String },
gender: { type: String, optional: true },
+ qualifaication: { type: String, optional: true },
+ specialization: { type: String, optional: true },
+ university: { type: String, optional: true },
+ degreeFrom: { type: String, optional: true },
+ degreeEnded: { type: String, optional: true },
services: {
type: Object,
optional: true,
@@ -81,7 +90,6 @@ Staffs.attachSchema(Staffs.schema);
Staffs.privateFields = {
orgId: 1,
- address: 1,
isMetaUser: 1,
createdAt: 1,
diff --git a/imports/collections/staff/methods.js b/imports/collections/staff/methods.js
index 5322be1..e4b268e 100644
--- a/imports/collections/staff/methods.js
+++ b/imports/collections/staff/methods.js
@@ -6,10 +6,10 @@ import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
import { Bert } from 'meteor/themeteorchef:bert';
import { Users } from '/imports/collections/users/index';
-import { Teachers } from '/imports/collections/staff/index';
+import { Staffs } from '/imports/collections/staff/index';
import { Orgs } from '/imports/collections/orgs/index';
-export const teachersMethods = new ValidatedMethod({
- name: 'teachers.method',
+export const staffMethods = new ValidatedMethod({
+ name: 'staff.method',
validate: new SimpleSchema({
itemId: { type: String },
@@ -20,3 +20,68 @@ export const teachersMethods = new ValidatedMethod({
},
});
+
+export const staffAddNew = new ValidatedMethod({
+ name: 'staff.addNew',
+
+ validate: new SimpleSchema({
+ employeeId: { type: String },
+ firstName: { type: String },
+ lastName: { type: String },
+ martialStatus: { type: String },
+ gender: { type: String },
+ dob: { type: String },
+ email: { type: String },
+ phone: { type: String },
+ address: { type: String },
+ type: { type: String },
+ doj: { type: String },
+ teaching: { type: String },
+ qualifaication: { type: String },
+ specialization: { type: String },
+ university: { type: String },
+ degreeFrom: { type: String },
+ degreeEnded: { type: String },
+ }).validator(),
+
+ run(data) {
+ const user = Users.findOne({_id: Meteor.userId()});
+ if(!user) return false;
+ const org = Orgs.findOne({_id: user.orgId});
+ if(!org) return false;
+ // console.log(data);return true;
+ orgId = user.orgId;
+ newUserId = Users.insert({
+ emails: [{address:data.email, verified: false}],
+ phones: [{number:data.phone, verified: false}],
+ firstName: data.firstName,
+ lastName: data.lastName,
+ address: data.address,
+ orgId: orgId,
+ role: 'STAFF'
+ });
+ console.log("newUserId");
+ console.log(newUserId);
+ if(newUserId){
+ newStaffId = Staffs.insert({
+ userId: newUserId,
+ orgId: orgId,
+ employeeId: data.employeeId,
+ martialStatus:data.martialStatus,
+ gender: data.gender,
+ dob: data.dob,
+ teaching: data.teaching,
+ type: data.type,
+ qualifaication: data.qualifaication,
+ specialization: data.specialization,
+ university: data.university,
+ degreeFrom: data.degreeFrom,
+ degreeEnded: data.degreeEnded
+ });
+ }
+ console.log("newStaffId");
+ console.log(newStaffId);
+ return {};
+ },
+
+});
diff --git a/imports/collections/staff/publications.js b/imports/collections/staff/publications.js
index e508417..35ad280 100644
--- a/imports/collections/staff/publications.js
+++ b/imports/collections/staff/publications.js
@@ -3,10 +3,10 @@ import { check, Match } from 'meteor/check'
import { Orgs } from '/imports/collections/orgs/index';
import { Users } from '/imports/collections/users/index';
-import { Teachers } from '/imports/collections/staff/index';
+import { Staffs } from '/imports/collections/staff/index';
-Meteor.publish('teachers.forMyOrg', function () {
+Meteor.publish('staff.forMyOrg', function () {
const user = Users.findOne({_id: this.userId});
if(!user) return [];
- return Teachers.find({orgId: user.orgId});
+ return Staffs.find({orgId: user.orgId});
});
diff --git a/imports/collections/staff/serverCsvUpload.js b/imports/collections/staff/serverCsvUpload.js
index 814e753..83a0e02 100644
--- a/imports/collections/staff/serverCsvUpload.js
+++ b/imports/collections/staff/serverCsvUpload.js
@@ -11,7 +11,7 @@ import { Users } from '/imports/collections/users/index
import { Orgs } from '/imports/collections/orgs/index';
import { Students } from '/imports/collections/students/index'
import { Parents } from '/imports/collections/parents/index';
-import { Staffs } from '/imports/collections/staff/index';
+import { Staffs } from '/imports/collections/staff/index';
import csv1 from 'csv2json-convertor'
import json2csv from 'json2csv'
import fs from 'fs'
diff --git a/imports/collections/users/index.js b/imports/collections/users/index.js
index 76604dd..39c27f9 100644
--- a/imports/collections/users/index.js
+++ b/imports/collections/users/index.js
@@ -115,6 +115,7 @@ Users.schema = new SimpleSchema({
firstName: { type: String, optional: true },
middlename: { type: String, optional: true },
lastName: { type: String, optional: true },
+ address: { type: String, optional: true, },
gender: { type: String, optional: true },
dob: { type: String, optional: true },
emails: {
@@ -126,8 +127,8 @@ Users.schema = new SimpleSchema({
},
phones: {
type: [new SimpleSchema({
- country: { type: String, },
- prefix: { type: String, },
+ country: { type: String, optional: true },
+ prefix: { type: String, optional: true },
number: { type: String, },
verified: { type: Boolean, },
})],
diff --git a/imports/collections/users/publications.js b/imports/collections/users/publications.js
index cbf857b..f21a226 100644
--- a/imports/collections/users/publications.js
+++ b/imports/collections/users/publications.js
@@ -17,6 +17,6 @@ Meteor.publish('users.forMyOrg', function() {
if(!org) return [];
return Users.find({
- orgId: user.orgId,role:"STUDENT"
+ orgId: user.orgId
});
});