Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

Commit

Permalink
Multiple Levels in Activities , Part 1 (#155)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lunayach @paavininanda
lunayach authored and paavininanda committed Aug 6, 2018
1 parent 54779fb commit a33aa09
Show file tree
Hide file tree
Showing 61 changed files with 782 additions and 212 deletions.
45 changes: 24 additions & 21 deletions config/passport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = function(passport, models) {

const localUser = models.user_account;
const progress = models.progress;
const levelProgress = models.levelProgress;
const activityProgress = models.activityProgress;
let fname, lname;

Expand Down Expand Up @@ -69,35 +70,37 @@ module.exports = function(passport, models) {
user_id: user.id,
stage: 0,
activity: 0
}})
.spread((status, created) => {
const response = {email: user.email, name: user.name};
return done(null, response);
})
.catch(function(err) {
return done(err);
});
}}).spread(() => {
const response = {email: user.email, name: user.name};
return done(null, response);
}).catch(function(err) {
return done(err);
});
levelProgress.findOrCreate({where: {
user_id: user.id
}, defaults: {
user_id: user.id,
}}).spread(() => {
const response = {email: user.email, name: user.name};
return done(null, response);
}).catch(function(err) {
return done(err);
});
activityProgress.findOrCreate({where: {
user_id: user.id
}, defaults: {
user_id: user.id,
}})
.spread(() => {
const response = {email: user.email, name: user.name};
return done(null, response);
})
.catch(function(err) {
return done(err);
});
}

)
.catch(function(err) {
}}).spread(() => {
const response = {email: user.email, name: user.name};
return done(null, response);
}).catch(function(err) {
return done(err);
});
}).catch(function(err) {
return done(err);
});
});
}));

passport.use('local-login', new LocalStrategy({
usernameField: 'email',
passwordField: 'password',
Expand Down
45 changes: 34 additions & 11 deletions data/codes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,28 @@
"code": "PCE035",
"message": "PCE035 Something went wrong while fetching activity-progress data",
"reason": "Internal Server Error"
}
},
"PCE036": {
"code": "PCE036",
"message": "No activity-level data was found",
"reason": "User is not logged in or his data in not logged in levelProgress Table"
},
"PCE037": {
"code": "PCE037",
"message": "Something went wrong while fetching level-progress data",
"reason": "Internal Server Error"
},
"PCE038": {
"code": "PCE038",
"message": "Something went wrong while updating level-progress data",
"reason": "Internal Server Error"
},
"PCE039": {
"code": "PCE039",
"message": "Could not update user's activity level",
"reason": "Request body was empty"
}
},

"success": {
"PCS001": {
"code": "PCS001",
Expand All @@ -202,21 +221,25 @@
"message": "PCS005 : Verification mail sent, please check your mail"
},
"PCS006": {
"code": "PCS006",
"message": "PCS006 : User's profile was successfully updated"
"code": "PCS006",
"message": "PCS006 : User's profile was successfully updated"
},
"PCS007": {
"code": "PCS007",
"message": "PCS007 User's current badge was successfully updated"
"code": "PCS007",
"message": "PCS007 User's current badge was successfully updated"
},
"PCS008": {
"code": "PCS008",
"message": "PCS008 User's current total score was successfully updated"
"code": "PCS008",
"message": "PCS008 User's current total score was successfully updated"
},
"PCS009": {
"code": "PCS009",
"message": "PCS009 User's current score in the specific activity was updated"
}
"code": "PCS009",
"message": "PCS009 User's current score in the specific activity was updated"
},
"PCS010": {
"code": "PCS010",
"message": "User's current level in the specific activity was updated"
}
}
}

217 changes: 150 additions & 67 deletions data/quiz.json
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,153 @@
{
"quizlist":
[
{
"question":"Malaria is transmitted ______",
"option1":"Through mosquito bites",
"option2":"By eating tainted food",
"option3":"by physical contact",
"option4":"By playing in dirt",
"answer":"1"
},
{
"question":"Malaria is prevented by ______",
"option1":"Playing in dirt",
"option2":"By not maintaining hygiene",
"option3":"Sleeping under an insecticide-treated bednet",
"option4":"By eating unprotected food",
"answer":"3"
},
{
"question":"Which of the following can repel mosquitoes?",
"option1":"Banana",
"option2":"Chilli",
"option3":"Citronella",
"option4":"Garlic",
"answer":"3"
},
{
"question":"Which of these drink contains quinine, an anti-malarial property?",
"option1":"Lemonade",
"option2":"Tonic",
"option3":"Warm milk",
"option4":"Cola",
"answer":"2"
},
{
"question":"Malaria is transmitted by a mosquito bite, but what causes the disease?",
"option1":"Insecticide",
"option2":"A virus",
"option3":"Blood poisoning",
"option4":"A parasite",
"answer":"4"
},
{
"question":"Find the odd symptom of malaria",
"option1":"Fever",
"option2":"Dizziness",
"option3":"Fatigue",
"option4":"Back pain",
"answer":"2"
},
{
"question":"Find the odd statement",
"option1":"Malaria is a neglected tropical disease",
"option2":"If you get malaria once, you won't ever get it again",
"option3":"Malaria is quite often endemic in poorer regions of the world",
"option4":"Malaria is not curable",
"answer":"3"
},
{
"question":"Disease associated with malaria",
"option1":"Jaundice",
"option2":"Tuberculosis",
"option3":"Cholera",
"option4":"Typhoid",
"answer":"1"
}
]
"level1": [
{
"question": "Malaria is transmitted ______",
"option1": "Through mosquito bites",
"option2": "By eating tainted food",
"option3": "by physical contact",
"option4": "By playing in dirt",
"answer": "1"
},
{
"question": "Malaria is prevented by ______",
"option1": "Playing in dirt",
"option2": "By not maintaining hygiene",
"option3": "Sleeping under an insecticide-treated bednet",
"option4": "By eating unprotected food",
"answer": "3"
},
{
"question": "Which of the following can repel mosquitoes?",
"option1": "Banana",
"option2": "Chilli",
"option3": "Citronella",
"option4": "Garlic",
"answer": "3"
},
{
"question": "Which of these drink contains quinine, an anti-malarial property?",
"option1": "Lemonade",
"option2": "Tonic",
"option3": "Warm milk",
"option4": "Cola",
"answer": "2"
}
],
"level2": [
{
"question": "Malaria is transmitted by a mosquito bite, but what causes the disease?",
"option1": "Insecticide",
"option2": "A virus",
"option3": "Blood poisoning",
"option4": "A parasite",
"answer": "4"
},
{
"question": "Find the odd symptom of malaria",
"option1": "Fever",
"option2": "Dizziness",
"option3": "Fatigue",
"option4": "Back pain",
"answer": "2"
},
{
"question": "Find the odd statement",
"option1": "Malaria is a neglected tropical disease",
"option2": "If you get malaria once, you won't ever get it again",
"option3": "Malaria is quite often endemic in poorer regions of the world",
"option4": "Malaria is not curable",
"answer": "3"
},
{
"question": "Disease associated with malaria",
"option1": "Jaundice",
"option2": "Tuberculosis",
"option3": "Cholera",
"option4": "Typhoid",
"answer": "1"
},
{
"question": "There are four kinds of malaria that can infect humans. They are all spread by what?",
"option1": " a worm in the intestine",
"option2": " a tick bite",
"option3": " a mosquito bite",
"option4": " a tsetse fly bite",
"answer": "3"
},
{
"question": "What part of the body do these malaria parasites feed on?",
"option1": " intestinal lining",
"option2": "muscles",
"option3": "red blood cells",
"option4": "brain tissue",
"answer": "3"
}
],
"level3": [
{
"question": "How long must a malaria parasite grow in its host before infection can be spread to a human being?",
"option1": " twenty four hours",
"option2": "a week or more",
"option3": "two weeks",
"option4": "one month",
"answer": "2"
},
{
"question": "Once malaria parasites enter a person's blood they then travel to which organ?",
"option1": "kidneys",
"option2": "liver",
"option3": "heart",
"option4": "stomach",
"answer": "2"
},
{
"question": "Of the four types of malaria, 'falciparum malaria' is the most deadly. This type of malaria is most prevalent in what place?",
"option1": "southeast Asia",
"option2": "subSaharan Africa",
"option3": "India",
"option4": "South Africa",
"answer": "2"
},
{
"question": "How many countries and territories worldwide are considered at risk for malarial infections?",
"option1": "around 50",
"option2": "more than 100",
"option3": "fewer than 80",
"option4": "exactly 65",
"answer": "2"
},
{
"question": "According to the World Health Organization's estimate in 2000, malaria kills one child how often?",
"option1": " every 15 minutes",
"option2": " every minute",
"option3": "every 30 seconds",
"option4": "every five minutes",
"answer": "3"
},
{
"question": "African children under the age of five suffer approximately how many bouts of malaria per year?",
"option1": "10",
"option2": "6",
"option3": "12",
"option4": "3",
"answer": "2"
},
{
"question": "Which type of malaria is usually fatal?",
"option1": " severe malaria",
"option2": "cerebral malaria",
"option3": "placental malaria",
"option4": " all of the above",
"answer": "4"
},
{
"question": "How soon, after infection, will a person feel usually begin to feel ill?",
"option1": " 6 days",
"option2": "2 days",
"option3": "4 days",
"option4": "none of the above",
"answer": "4"
}
]
}

4 changes: 4 additions & 0 deletions database/associations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = function(models) {
const Progress = models.progress;
const Infokit = models.info_kit;
const Verification = models.verification;
const levelProgress = models.levelProgress;
const activityProgress = models.activityProgress;

// 1:1 relationship between User and Progress table
Expand All @@ -12,6 +13,9 @@ module.exports = function(models) {
User.hasOne(Infokit, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
Verification.belongsTo(User, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
User.hasOne(Verification, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
levelProgress.belongsTo(User, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
User.hasOne(levelProgress, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
activityProgress.belongsTo(User, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
User.hasOne(activityProgress, {foreignKey: 'user_id', targetKey: 'id', onDelete: 'cascade'});
};

Loading

0 comments on commit a33aa09

Please sign in to comment.