Commit 7d2b7051057bcaa4dba31075663aa0c1c9093d8c

Authored by Nikita Kulshreshtha
2 parents c597217c eea69634

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

400-SOURCECODE/AIAHTML5.Web/Web.config
... ... @@ -17,6 +17,9 @@
17 17 <compilation debug="true" targetFramework="4.5" />
18 18 <httpRuntime targetFramework="4.5" />
19 19 </system.web>
  20 + <location path="app/views">
  21 +
  22 +</location>
20 23 <system.webServer>
21 24 <rewrite>
22 25 <rules>
... ... @@ -27,13 +30,14 @@
27 30 <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
28 31 <add input="{REQUEST_URI}" pattern="^/(api)" negate="true" />
29 32 </conditions>
30   - <action type="Rewrite" url="/AIA/" />
  33 + <action type="Rewrite" url="/" />
31 34 </rule>
32 35 </rules>
33 36 </rewrite>
34 37 <staticContent>
  38 +
35 39 <remove fileExtension=".mp3" />
36   - <clientCache cacheControlMode="DisableCache" />
  40 + <!--<clientCache cacheControlMode="DisableCache" />-->
37 41 <remove fileExtension=".woff" />
38 42 <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
39 43 <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html
1   -
2   - <div class="bodyWrap row" ng-controller="3dAController">
3   - <div ng-include="aap/widget/MainMenu.html"></div>
4   - <div class="daBodyView" ng-init="open3dImageView()">
5   - <div class="col-sm-12 pageHeading">
6   - <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
7   - <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
8   - <h4 class="pull-left">{{bodySystemTitle}}</h4>
9   - <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
10   - <div class="clearfix"></div>
11   - </div>
  1 +<div class="bodyWrap row ">
  2 + <div ng-include="'app/widget/MainMenu.html'" />
  3 + <div class="bodyWrap row" ng-controller="3dAController">
  4 + <div ng-include="aap/widget/MainMenu.html"></div>
  5 + <div class="daBodyView" ng-init="open3dImageView()">
  6 + <div class="col-sm-12 pageHeading">
  7 + <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
  8 + <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
  9 + <h4 class="pull-left">{{bodySystemTitle}}</h4>
  10 + <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
  11 + <div class="clearfix"></div>
  12 + </div>
12 13  
13   - <div class="col-sm-12">
14   - <div class="container-fluid main-full">
15   - <div class="row" style="padding-left:250px;">
16   - <object data="{{SelectedCAthumbImage}}" width="800" height="560" type="image/svg+xml"></object>
17   - <!--<object data="https://preview.biodigital.com/widget/?m=preview/v2_musculoskeletal_head_neck.json&amp;ui-all=true&amp;ui-tree=true&amp;uaid=f7n" width="600" height="500" type="image/svg+xml"></object>-->
18   - </div>
19   - </div>
20   - </div>
21   - </div>
22   -</div>
  14 + <div class="col-sm-12">
  15 + <div class="container-fluid main-full" style="margin-top: 93px !important;">
  16 + <div class="row" style="padding-left:203px;">
  17 + <object data="{{SelectedCAthumbImage}}" width="100%" height="800px" type="image/svg+xml"></object>
  18 + <!--<object data="https://preview.biodigital.com/widget/?m=preview/v2_musculoskeletal_head_neck.json&amp;ui-all=true&amp;ui-tree=true&amp;uaid=f7n" width="600" height="500" type="image/svg+xml"></object>-->
  19 + </div>
  20 + </div>
  21 + </div>
  22 + </div>
  23 + </div>
23 24  
  25 +</div>
24 26 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/le/qz_dat_sk.json
... ... @@ -93,16 +93,61 @@
93 93 "Title": "Drag the labels to the correct location on the image.",
94 94 "activityTitle": "Bones of Upper Limb",
95 95 "ImagePath":"SK-07.JPG",
96   - "OptionBox": [{"BoxName": "T1","topcoord":"35","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T2","topcoord":"97","leftcoord":"4","Answervalue":"","QuizText":""},
97   - {"BoxName": "T3","topcoord":"198","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"252","leftcoord":"4","Answervalue":"","QuizText":""},
98   - {"BoxName": "T5","topcoord":"16","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"112","leftcoord":"613","Answervalue":"","QuizText":""},
99   - {"BoxName": "T7","topcoord":"169","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"366","leftcoord":"613","Answervalue":"","QuizText":""}],
  96 + "OptionBox": [{"BoxName": "T1","topcoord":"20","leftcoord":"2","Answervalue":"","QuizText":""},{"BoxName": "T2","topcoord":"142","leftcoord":"2","Answervalue":"","QuizText":""},
  97 + {"BoxName": "T3","topcoord":"238","leftcoord":"2","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"347","leftcoord":"2","Answervalue":"","QuizText":""},
  98 + {"BoxName": "T5","topcoord":"38","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"120","leftcoord":"613","Answervalue":"","QuizText":""},
  99 + {"BoxName": "T7","topcoord":"330","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"366","leftcoord":"613","Answervalue":"","QuizText":""}],
100 100 "Options": [{"OptionNumber": "A","OptionTitle": "Ulna","textalign":"left"},{"OptionNumber": "B","OptionTitle": "Trochlea of humerus","textalign":"right"},
101 101 {"OptionNumber": "C","OptionTitle": "Radius","textalign":"left"},{"OptionNumber": "D","OptionTitle": "Capitulum of humerus","textalign":"left"},
102 102 {"OptionNumber": "E","OptionTitle": "Head of humerus","textalign":"left"},{"OptionNumber": "F","OptionTitle": "Acromion process of scapula","textalign":"right"},
103 103 {"OptionNumber": "G","OptionTitle": "Coracoid process of scapula","textalign":"right"},{"OptionNumber": "H","OptionTitle": "Clavicle","textalign":"right"}],
104 104 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "H"},{"OptionBox": "T3","Answer": "E"},{"OptionBox": "T4","Answer": "G"},
105 105 {"OptionBox": "T5","Answer": "B"},{"OptionBox": "T6","Answer": "C"},{"OptionBox": "T7","Answer": "D"},{"OptionBox": "T8","Answer": "F"}]
  106 + },{
  107 + "Number": "8",
  108 + "Title": "Drag the labels to the correct location on the image.",
  109 + "activityTitle": "Bones of Forearm",
  110 + "ImagePath":"SK-08.JPG",
  111 + "OptionBox": [{"BoxName": "T1","topcoord":"68","leftcoord":"2","Answervalue":"","QuizText":""},{"BoxName": "T2","topcoord":"150","leftcoord":"2","Answervalue":"","QuizText":""},
  112 + {"BoxName": "T3","topcoord":"189","leftcoord":"2","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"337","leftcoord":"2","Answervalue":"","QuizText":""},
  113 + {"BoxName": "T5","topcoord":"12","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"98","leftcoord":"613","Answervalue":"","QuizText":""},
  114 + {"BoxName": "T7","topcoord":"189","leftcoord":"613","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"336","leftcoord":"613","Answervalue":"","QuizText":""}],
  115 + "Options": [{"OptionNumber": "A","OptionTitle": "Styloid process of radius","textalign":"left"},{"OptionNumber": "B","OptionTitle": "Tuberosity of radius","textalign":"right"},
  116 + {"OptionNumber": "C","OptionTitle": "Head of radius","textalign":"left"},{"OptionNumber": "D","OptionTitle": "Coronoid process of ulna","textalign":"left"},
  117 + {"OptionNumber": "E","OptionTitle": "Tuberosity of ulna","textalign":"left"},{"OptionNumber": "F","OptionTitle": "Body of radius","textalign":"right"},
  118 + {"OptionNumber": "G","OptionTitle": "Body of ulna","textalign":"right"},{"OptionNumber": "H","OptionTitle": "Head of ulna","textalign":"right"}],
  119 + "correctResponse": [{"OptionBox": "T1","Answer": "C"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "F"},{"OptionBox": "T4","Answer": "A"},
  120 + {"OptionBox": "T5","Answer": "D"},{"OptionBox": "T6","Answer": "E"},{"OptionBox": "T7","Answer": "G"},{"OptionBox": "T8","Answer": "H"}]
  121 + },{
  122 + "Number": "9",
  123 + "Title": "Drag the labels to the correct location on the image.",
  124 + "activityTitle": "Bones of Hand I",
  125 + "ImagePath":"SK-09.JPG",
  126 + "OptionBox": [{"BoxName": "T1","topcoord":"10","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T2","topcoord":"130","leftcoord":"4","Answervalue":"","QuizText":""},
  127 + {"BoxName": "T3","topcoord":"230","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"287","leftcoord":"4","Answervalue":"","QuizText":""},
  128 + {"BoxName": "T5","topcoord":"24","leftcoord":"614","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"112","leftcoord":"614","Answervalue":"","QuizText":""},
  129 + {"BoxName": "T7","topcoord":"211","leftcoord":"614","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"260","leftcoord":"614","Answervalue":"","QuizText":""}],
  130 + "Options": [{"OptionNumber": "A","OptionTitle": "Trapezium","textalign":"left"},{"OptionNumber": "B","OptionTitle": "Lunate","textalign":"right"},
  131 + {"OptionNumber": "C","OptionTitle": "Capitate","textalign":"left"},{"OptionNumber": "D","OptionTitle": "Scaphoid","textalign":"left"},
  132 + {"OptionNumber": "E","OptionTitle": "Triquetral","textalign":"left"},{"OptionNumber": "F","OptionTitle": "Trapezoid","textalign":"right"},
  133 + {"OptionNumber": "G","OptionTitle": "Pisiform","textalign":"right"},{"OptionNumber": "H","OptionTitle": "Hamate","textalign":"right"}],
  134 + "correctResponse": [{"OptionBox": "T1","Answer": "D"},{"OptionBox": "T2","Answer": "C"},{"OptionBox": "T3","Answer": "A"},{"OptionBox": "T4","Answer": "F"},
  135 + {"OptionBox": "T5","Answer": "B"},{"OptionBox": "T6","Answer": "E"},{"OptionBox": "T7","Answer": "G"},{"OptionBox": "T8","Answer": "H"}]
  136 + },{
  137 + "Number": "10",
  138 + "Title": "Drag the labels to the correct location on the image.",
  139 + "activityTitle": "Bones of Hand II",
  140 + "ImagePath":"SK-10.JPG",
  141 + "OptionBox": [{"BoxName": "T1","topcoord":"10","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T2","topcoord":"130","leftcoord":"4","Answervalue":"","QuizText":""},
  142 + {"BoxName": "T3","topcoord":"230","leftcoord":"4","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"287","leftcoord":"4","Answervalue":"","QuizText":""},
  143 + {"BoxName": "T5","topcoord":"24","leftcoord":"614","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"215","leftcoord":"614","Answervalue":"","QuizText":""},
  144 + {"BoxName": "T7","topcoord":"301","leftcoord":"614","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"392","leftcoord":"614","Answervalue":"","QuizText":""}],
  145 + "Options": [{"OptionNumber": "A","OptionTitle": "1st metacarpal","textalign":"left"},{"OptionNumber": "B","OptionTitle": "2nd metacarpal","textalign":"right"},
  146 + {"OptionNumber": "C","OptionTitle": "5th metacarpal","textalign":"left"},{"OptionNumber": "D","OptionTitle": "Proximal phalanx of thumb","textalign":"left"},
  147 + {"OptionNumber": "E","OptionTitle": "Distal phalanx of thumb","textalign":"left"},{"OptionNumber": "F","OptionTitle": "Proximal phalynx of finger","textalign":"right"},
  148 + {"OptionNumber": "G","OptionTitle": "Middle phalanx of finger","textalign":"right"},{"OptionNumber": "H","OptionTitle": "Distal phalanx of finger","textalign":"right"}],
  149 + "correctResponse": [{"OptionBox": "T1","Answer": "C"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "F"},{"OptionBox": "T4","Answer": "G"},
  150 + {"OptionBox": "T5","Answer": "A"},{"OptionBox": "T6","Answer": "D"},{"OptionBox": "T7","Answer": "E"},{"OptionBox": "T8","Answer": "H"}]
106 151 }]
107 152 }]
108 153 }
109 154 \ No newline at end of file
... ...