Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/image clicks #4

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
2bfce6d
Added Module 1 and Module 2 graphics functionality
Feb 14, 2019
5ccc875
Removed Module 3 and Admin Tabs and Compressed images
nobertmn Feb 21, 2019
4500f4c
removing node_modules
ashaban Mar 27, 2019
b012c04
Adding authentication
ashaban Mar 27, 2019
7bc9879
saving response data into database
ashaban Mar 28, 2019
025b7c9
adding reporting
ashaban Mar 30, 2019
93ca70d
adding reporting
ashaban Mar 30, 2019
870f376
Update module1.js
ashaban Apr 3, 2019
02cd26a
Update module2.js
ashaban Apr 3, 2019
172ca67
Update module1.js
ashaban Apr 3, 2019
830a17e
Update module2.js
ashaban Apr 3, 2019
5df33d2
Minor fixes
ashaban Apr 3, 2019
c5d69b5
temporarily disabling authentication
ashaban May 7, 2019
a76aa56
temporarily disabling authentication
ashaban May 7, 2019
494cb84
Change introduction text
lokisapocalypse Sep 24, 2019
8601a9f
Merge pull request #1 from intrahealth/feature/change-intro-text
lokisapocalypse Sep 24, 2019
3131532
Change name of clients
lokisapocalypse Sep 24, 2019
20da2e8
Merge pull request #2 from intrahealth/feature/name-clients
lokisapocalypse Sep 24, 2019
4b5dc10
Update responses for client a quiz
lokisapocalypse Sep 24, 2019
ce2cec5
Add content changes for second module
lokisapocalypse Sep 24, 2019
3c670f6
Add package.json and setup backend scripts
lokisapocalypse Sep 24, 2019
218e75e
Merge pull request #3 from intrahealth/feature/update-answer-texts
lokisapocalypse Sep 24, 2019
d0d745c
Merge pull request #4 from intrahealth/feature/setup-backend
lokisapocalypse Sep 24, 2019
3ccbe95
Fix bug with data not saving module data
lokisapocalypse Sep 24, 2019
8f9111d
Remove pie chart and add tables to reports page
lokisapocalypse Sep 25, 2019
c550fb3
Merge pull request #5 from intrahealth/feature/report-changes
lokisapocalypse Sep 25, 2019
d0dc800
Build tabular data for reports
lokisapocalypse Sep 25, 2019
02f2f8f
Merge pull request #6 from intrahealth/feature/report-changes
lokisapocalypse Sep 25, 2019
bd0e146
Enable login
lokisapocalypse Sep 26, 2019
0c5e55a
Merge pull request #7 from intrahealth/feature/login
lokisapocalypse Sep 26, 2019
5d02043
Update production connection information
lokisapocalypse Sep 26, 2019
11c95bd
Merge pull request #8 from intrahealth/feature/prod-connection
lokisapocalypse Sep 26, 2019
4343d45
Add numeral to package.json
lokisapocalypse Sep 26, 2019
220c7bb
Merge pull request #9 from intrahealth/feature/update-package
lokisapocalypse Sep 26, 2019
a9a17f2
Use data tables on reports page
lokisapocalypse Sep 26, 2019
08ec0b3
Merge pull request #10 from intrahealth/feature/update-package
lokisapocalypse Sep 26, 2019
67eafc8
Remove duplicate data table
lokisapocalypse Sep 26, 2019
074eab0
Merge pull request #11 from intrahealth/feature/update-package
lokisapocalypse Sep 26, 2019
ecafd60
Remove password from password page
lokisapocalypse Sep 26, 2019
3ce6cad
Merge pull request #12 from intrahealth/feature/no-password
lokisapocalypse Sep 26, 2019
e56a0b9
Add content changes for module 1
lokisapocalypse Sep 26, 2019
0141732
Update text for module 2
lokisapocalypse Sep 26, 2019
beb8784
Make module 2 show comment text
lokisapocalypse Sep 27, 2019
deda151
Remove debugging information
lokisapocalypse Sep 27, 2019
8000808
Merge pull request #13 from intrahealth/feature/content-changes
lokisapocalypse Sep 27, 2019
393d396
Require trainees to sign in with information before test
lokisapocalypse Sep 27, 2019
f19095b
Merge pull request #14 from intrahealth/feature/player-signin-fields
lokisapocalypse Sep 27, 2019
4d5525b
Filter reports by cadre and/or training
lokisapocalypse Sep 27, 2019
e4c9312
Merge pull request #15 from intrahealth/feature/filter-reports
lokisapocalypse Sep 27, 2019
1e97525
Add name to the modules
lokisapocalypse Jan 23, 2020
5856e73
Merge pull request #16 from intrahealth/feature/add-title
lokisapocalypse Jan 23, 2020
9626651
Redirect back to the module you were on
lokisapocalypse Jan 23, 2020
beeba14
Merge pull request #17 from intrahealth/feature/redirect-to-module
lokisapocalypse Jan 23, 2020
63a8eb9
Add title to home page
lokisapocalypse Jan 23, 2020
e343307
Merge pull request #18 from intrahealth/feature/add-title-to-home
lokisapocalypse Jan 23, 2020
93217ea
Change text for module 2, question 2
lokisapocalypse Feb 10, 2020
9821f86
Merge pull request #19 from intrahealth/feature/question-text
lokisapocalypse Feb 10, 2020
7a94fa8
Fix coordinates for question 3
lokisapocalypse Feb 10, 2020
d9ed49f
Merge pull request #20 from intrahealth/feature/mod2-question3
lokisapocalypse Feb 10, 2020
4dfc875
Add draggable to mod 2 question 4
lokisapocalypse Feb 11, 2020
31ec9de
Merge pull request #21 from intrahealth/feature/mod2-question4
lokisapocalypse Feb 11, 2020
6ea7447
Correct answer for question 8 in mod 2
lokisapocalypse Feb 12, 2020
94721cd
Merge pull request #22 from intrahealth/feature/mod2-question8
lokisapocalypse Feb 12, 2020
772c66e
Correct answers for mod 2, question 9
lokisapocalypse Feb 12, 2020
79d005c
Remove debugging text from error message
lokisapocalypse Feb 12, 2020
3f90dca
Merge pull request #23 from intrahealth/feature/mod2-question9
lokisapocalypse Feb 12, 2020
0812815
Add client name to module 1
lokisapocalypse Feb 12, 2020
57ac49f
Merge pull request #24 from intrahealth/feature/add-client-name
lokisapocalypse Feb 12, 2020
ec4e877
Add regions and districts to signup page
lokisapocalypse Feb 12, 2020
0d53046
Merge pull request #25 from intrahealth/feature/add-regions-districts
lokisapocalypse Feb 12, 2020
b3c3a42
Fix bug with reporting questions for module 1
lokisapocalypse Feb 13, 2020
803df6c
Merge pull request #26 from intrahealth/feature/incorrect-reports
lokisapocalypse Feb 13, 2020
daf9acd
Update incorrect response for question 12 in mod 2
lokisapocalypse Feb 13, 2020
a0450b5
Add filters for region and district
lokisapocalypse Feb 13, 2020
8336075
Remove subquestion response from mod 2 question 2
lokisapocalypse Feb 19, 2020
306cf55
Get coordinates from image instead of div
lokisapocalypse Feb 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
frontend/nodemodules
frontend/node_modules
backend/node_modules
1 change: 1 addition & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.swp
6 changes: 5 additions & 1 deletion backend/config/default.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"server": {
"hostname": "0.0.0.0",
"port": 3000
"port": 8081
},
"auth": {
"secret": "3084e343-71bc-4247-86e4-ea210af89c44",
"tokenDuration": 54000
},
"logger": {
"level": "info"
Expand Down
6 changes: 6 additions & 0 deletions backend/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,11 @@ function setConf(key, value) {
nconf.set(key, value);
}

setConf("DB_HOST", process.env.DB_HOST || "localhost")
setConf("DB_NAME", process.env.DB_NAME || "VMMC")
setConf("DB_USER", process.env.DB_USER || "")
setConf("DB_PASSWORD", process.env.DB_PASSWORD || "")
setConf("DB_PORT", process.env.DB_PORT || "27017")

exports.getConf = getConf;
exports.setConf = setConf;
Loading