From 7c5bc382446b033d5adeda3ee8a94d9c97af73a4 Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Wed, 12 Apr 2023 15:46:27 +0530 Subject: [PATCH 1/6] INITIAL COMMIT --- models/std_med_history.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 models/std_med_history.js diff --git a/models/std_med_history.js b/models/std_med_history.js new file mode 100644 index 0000000..cd470e6 --- /dev/null +++ b/models/std_med_history.js @@ -0,0 +1 @@ +xyz From 7ace34ab2b2044e511b08c9ec99b1f02bd87932e Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Wed, 12 Apr 2023 15:55:06 +0530 Subject: [PATCH 2/6] Created the student medical schema --- models/std_med_history.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/models/std_med_history.js b/models/std_med_history.js index cd470e6..a9becfe 100644 --- a/models/std_med_history.js +++ b/models/std_med_history.js @@ -1 +1,16 @@ -xyz +import { Schema } from 'mongoose'; +import { connector } from './databaseUtil'; + + +const studentMedicalSchema= new Schema({ + bloodGroup:{type:String, required:true}, + pastMedicalHistory:{type:String, required:true}, + immunisationHistory:{type:String, required:true}, + chronicMedicalConditions:{type:String, required:true}, + parentsEmailId:{type:String, required:true}, + parentsContact:{type:String, required:true}, + relativeContacts:{type:String, required:true}, +}) + +const medicalHistory=new connector.model('stu-med',studentMedicalSchema); +module.exports={}; \ No newline at end of file From 630a1d6cb6f2c32fa1be9ec35a2f96f2daf1618d Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Wed, 12 Apr 2023 15:56:38 +0530 Subject: [PATCH 3/6] removed unnecessary spaces --- models/databaseUtil.js | 3 --- models/std_med_history.js | 2 -- 2 files changed, 5 deletions(-) diff --git a/models/databaseUtil.js b/models/databaseUtil.js index 898c168..72efd10 100644 --- a/models/databaseUtil.js +++ b/models/databaseUtil.js @@ -1,8 +1,5 @@ const mongoose = require('mongoose'); require("dotenv").config(); - mongoose.set('strictQuery', true); mongoose.connect(`${process.env.DB_URL}`); - - module.exports = { connector:mongoose }; diff --git a/models/std_med_history.js b/models/std_med_history.js index a9becfe..e6e3bef 100644 --- a/models/std_med_history.js +++ b/models/std_med_history.js @@ -1,7 +1,6 @@ import { Schema } from 'mongoose'; import { connector } from './databaseUtil'; - const studentMedicalSchema= new Schema({ bloodGroup:{type:String, required:true}, pastMedicalHistory:{type:String, required:true}, @@ -11,6 +10,5 @@ const studentMedicalSchema= new Schema({ parentsContact:{type:String, required:true}, relativeContacts:{type:String, required:true}, }) - const medicalHistory=new connector.model('stu-med',studentMedicalSchema); module.exports={}; \ No newline at end of file From e35721164c992aaca4ed6cee908a427d3d231376 Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Thu, 13 Apr 2023 00:46:20 +0530 Subject: [PATCH 4/6] Restored databaseUtil.js to previous state and made the schema just an object --- models/databaseUtil.js | 5 ++++- models/std_med_history.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/models/databaseUtil.js b/models/databaseUtil.js index 72efd10..b0ab898 100644 --- a/models/databaseUtil.js +++ b/models/databaseUtil.js @@ -1,5 +1,8 @@ const mongoose = require('mongoose'); require("dotenv").config(); + mongoose.set('strictQuery', true); mongoose.connect(`${process.env.DB_URL}`); -module.exports = { connector:mongoose }; + + +module.exports = { connector:mongoose }; \ No newline at end of file diff --git a/models/std_med_history.js b/models/std_med_history.js index e6e3bef..856737d 100644 --- a/models/std_med_history.js +++ b/models/std_med_history.js @@ -1,7 +1,7 @@ import { Schema } from 'mongoose'; import { connector } from './databaseUtil'; -const studentMedicalSchema= new Schema({ +const studentMedicalSchema=({ bloodGroup:{type:String, required:true}, pastMedicalHistory:{type:String, required:true}, immunisationHistory:{type:String, required:true}, From 1cc687a402e80066c3fb9a8d0106f5521c715b60 Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Thu, 13 Apr 2023 00:48:47 +0530 Subject: [PATCH 5/6] Removed the import Schema statement from std_med_histoy.js --- models/std_med_history.js | 1 - 1 file changed, 1 deletion(-) diff --git a/models/std_med_history.js b/models/std_med_history.js index 856737d..90d9c6f 100644 --- a/models/std_med_history.js +++ b/models/std_med_history.js @@ -1,4 +1,3 @@ -import { Schema } from 'mongoose'; import { connector } from './databaseUtil'; const studentMedicalSchema=({ From 857ef17820c8c60d9624ec05600d14a74ca3e6be Mon Sep 17 00:00:00 2001 From: Shivam Tiwari Date: Thu, 13 Apr 2023 19:39:13 +0530 Subject: [PATCH 6/6] Remove the extra brackets and made parents, relative contacts to number --- models/std_med_history.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/models/std_med_history.js b/models/std_med_history.js index 90d9c6f..7f6dc12 100644 --- a/models/std_med_history.js +++ b/models/std_med_history.js @@ -1,13 +1,13 @@ import { connector } from './databaseUtil'; -const studentMedicalSchema=({ +const studentMedicalSchema={ bloodGroup:{type:String, required:true}, pastMedicalHistory:{type:String, required:true}, immunisationHistory:{type:String, required:true}, - chronicMedicalConditions:{type:String, required:true}, + chronicMedicalConditions:{type:String}, parentsEmailId:{type:String, required:true}, - parentsContact:{type:String, required:true}, - relativeContacts:{type:String, required:true}, -}) + parentsContact:{type:Number, required:true}, + relativeContacts:{type:Number, required:true}, +} const medicalHistory=new connector.model('stu-med',studentMedicalSchema); module.exports={}; \ No newline at end of file