Skip to content

Commit

Permalink
removed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
balamma committed May 20, 2021
2 parents e4b65ee + 240fa83 commit a4d5ffc
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 345 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/deployment-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# The following job will pull phase3 lab management scipt and build the experiment
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '12'
check-latest: true
- run: |
git clone -b pipeline https://github.com/virtual-labs/ph3-lab-mgmt
cd ph3-lab-mgmt/ph3-beta-to-ui3.0-conv
make host-experiments
cd ../../
git clone --depth=1 https://github.com/virtual-labs/ph3-lab-mgmt
cd ph3-lab-mgmt
npm install
npm run build-exp
cd ../
git config --local user.email "admin@vlabs.ac.in"
git config --local user.name "vleadadmin"
git checkout --orphan gh-pages
Expand Down
155 changes: 0 additions & 155 deletions experiment/posttest.js

This file was deleted.

31 changes: 31 additions & 0 deletions experiment/posttest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[{
"question": "1. Quality of imaging on an insulating sample can be enhanced by:",
"answers": {
"a": "Increasing the pressure of chamber (lower vacuum)",
"b": "Decreasing the pressure of chamber (higher vacuum)"
},
"correctAnswer": "a"
}, {
"question": "2. Quality of imaging on an insulating sample will deteriorate when using:",
"answers": {
"a": "Low accelerating voltage of electron beam ",
"b": "High accelerating voltage of electron beam "
},
"correctAnswer": "a"
}, {
"question": "3. The beam damage on a polymeric sample will be high at ___________ accelerating voltage and ________ beam size.",
"answers": {
"a": "low accelerating voltage and smaller spot size",
"b": "low accelerating voltage and bigger spot size",
"c": "high accelerating voltage and smaller spot size",
"d": "high accelerating voltage and bigger spot size"
},
"correctAnswer": "d"
}, {
"question": "4. The following image is taken _______________ conductive coating on the polymeric sample.<img src='images/post6.jpg'>",
"answers": {
"a": "with",
"b": "without"
},
"correctAnswer": "b"
}]
172 changes: 0 additions & 172 deletions experiment/pretest.js

This file was deleted.

Loading

0 comments on commit a4d5ffc

Please sign in to comment.