ADAM / AIAHTML5

Commit 78a8690b3d7633b1a24b26d171503b8a158d3b25

Authored by Amrita Vishnoi
2 parents e3c3cc0e 7dd270c6

Merge branch 'QA' into Develop

Inline Side-by-side
Showing 5 changed files with 69 additions and 49 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @78a8690
... ... @@ -614,7 +614,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
614 614 theme: 'success',
615 615 currentController: 'CIController',
616 616 parentSlug: 'clinical-illustrations',
617   - content: '<div class="row" id="canvasDiv"><div style="align:left;><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
  617 + content: '<div class="row" id="canvasDiv"><div style="align:left;"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
618 618 '<div class="col-sm-12 img-thumbnail" align="center">' +
619 619 '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
620 620 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @78a8690
... ... @@ -3646,12 +3646,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3646 3646  
3647 3647 $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationNotForTBox) {
3648 3648 if (isAnnotationNotForTBox == true) {
3649   - if ($scope.MultiLanguageAnnationArray > 1) {
  3649 + if ($scope.MultiLanguageAnnationArray.length > 1) {
3650 3650 $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; });
3651 3651  
3652 3652 }
3653 3653 else {
3654   - $scope.longestAnnotation = $scope.MultiLanguageAnnationArray[0].length;
  3654 + $scope.longestAnnotation = $scope.MultiLanguageAnnationArray[0];
3655 3655 }
3656 3656 //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that
3657 3657 // we decide the size of speech bubble
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @78a8690
... ... @@ -161,42 +161,42 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
161 161 if ($("#messageModal").length > 0) {
162 162 $("#messageModal").modal('hide');
163 163 }
164   - if (result.LoginFailureCauseId.toString() == LoginConstants.E_PASSWORD_NOT_MATCH) {
  164 + if (result.LoginFailureCauseId!=undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_PASSWORD_NOT_MATCH) {
165 165 $rootScope.isVisibleLogin = true;
166 166 $rootScope.errorMessage = LoginMessageConstants.INVALID_PASSWORD;
167 167 $("#messageModal").modal('show');
168 168 }
169   - else if (result.LoginFailureCauseId.toString() == LoginConstants.E_USER_ID_BLOCKED_24_HRS)
  169 + else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_ID_BLOCKED_24_HRS)
170 170 {
171 171 $rootScope.isVisibleLogin = true;
172 172 $rootScope.errorMessage = LoginMessageConstants.USER_BLOCKED;
173 173 $("#messageModal").modal('show');
174 174 }
175   - else if ((result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo!= null) && (result.LicenseInfo!= undefined) && (result.LicenseInfo.IsActive) && result.IsSubscriptionExpired)
  175 + else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && result.IsSubscriptionExpired)
176 176 {
177 177 $rootScope.isVisibleLogin = true;
178 178 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
179 179 $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
180 180 $("#messageModal").modal('show');
181 181 }
182   - else if ((result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
  182 + else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
183 183 $rootScope.isVisibleLogin = true;
184 184 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
185 185 $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
186 186 $("#messageModal").modal('show');
187 187 }
188   - else if ((result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
  188 + else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
189 189 $rootScope.isVisibleLogin = true;
190 190 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
191 191 $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
192 192 $("#messageModal").modal('show');
193 193 }
194   - else if ((result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
  194 + else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
195 195 $rootScope.isVisibleLogin = true;
196 196 $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
197 197 $("#messageModal").modal('show');
198 198 }
199   - else if (result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) {
  199 + else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) {
200 200 $rootScope.isVisibleLogin = true;
201 201 $rootScope.errorMessage = LoginMessageConstants.USER_INACTIVE_MESSAGE;
202 202 $("#messageModal").modal('show');
... ... @@ -225,7 +225,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
225 225 $rootScope.isVisibleLogin = false;
226 226 $rootScope.haveRoleAdmin = true;
227 227 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
228   - $('#dvUserModulesInfo').modal('show');
  228 + ShowAssignedModulesPopup(result.Modules);
229 229 $location.path('/');
230 230  
231 231 }
... ... @@ -236,7 +236,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
236 236 $rootScope.isVisibleLogin = false;
237 237 $rootScope.haveRoleAdmin = false;
238 238 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
239   - $('#dvUserModulesInfo').modal('show');
  239 + ShowAssignedModulesPopup(result.Modules);
240 240 $location.path('/');
241 241  
242 242 }
... ... @@ -267,6 +267,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
267 267 $("#messageModal").modal('show');
268 268 }
269 269 }
  270 + }
  271 +
  272 + function ShowAssignedModulesPopup(userModules) {
  273 + var allModules = Modules;
  274 + var elemId = 0;
  275 + for (var module = 0; module <= allModules.length; module++) {
  276 + elemId = module + 1; // Id starts from 1
  277 + $('#moduleDiv' + elemId).hide();
  278 + }
  279 + for (var count = 0; count < userModules.length; count++) {
  280 + for (var module = 0; module < allModules.length; module++) {
  281 + if (userModules[count].name.trim() == allModules[module].Name.trim()) {
  282 + elemId = count + 1; // Id starts from 1
  283 + $('#moduleDiv' + elemId).show();
  284 + break;
  285 + }
  286 + }
  287 + }
  288 + if (userModules.length > 0) {
  289 + $('#dvUserModulesInfo').modal('show');
  290 + }
270 291 }
271 292 $rootScope.UpdateLicenseTermStatus = function () {
272 293 $('#dvTermCondition').fadeOut();
... ... @@ -290,7 +311,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
290 311 $rootScope.isVisibleLogin = false;
291 312 $rootScope.userData = userInfo;
292 313 $rootScope.userModules = userInfo.Modules;
293   - $('#dvUserModulesInfo').modal('show');
  314 + ShowAssignedModulesPopup(userInfo.Modules);;
294 315 }
295 316 }
296 317 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @78a8690
... ... @@ -232,7 +232,7 @@ AIA.constant(&#39;Modules&#39;, [
232 232 },
233 233 {
234 234 Id: 7,
235   - Name: 'Anatomy Tests',
  235 + Name: 'Anatomy Test',
236 236 },
237 237 {
238 238 Id: 8,
... ... @@ -240,11 +240,11 @@ AIA.constant(&#39;Modules&#39;, [
240 240 },
241 241 {
242 242 Id: 9,
243   - Name: 'ADAM Images',
  243 + Name: 'A.D.A.M. Images',
244 244 },
245 245 {
246 246 Id: 10,
247   - Name: 'ADAM On Demand',
  247 + Name: 'A.D.A.M. OnDemand',
248 248 },
249 249 {
250 250 Id: 11,
... ... @@ -262,7 +262,7 @@ AIA.constant(&#39;Modules&#39;, [
262 262 },
263 263 {
264 264 Id: 14,
265   - Name: 'Complementary and Alternative Medicine',
  265 + Name: 'CAM', //Complementary and Alternative Medicine'
266 266 },
267 267 {
268 268 Id: 15,
... ... @@ -270,7 +270,7 @@ AIA.constant(&#39;Modules&#39;, [
270 270 },
271 271 {
272 272 Id: 16,
273   - Name: 'Health Navigator',
  273 + Name: 'Symptom Navigator', //Health Navigator',
274 274 },
275 275 {
276 276 Id: 17,
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @78a8690
... ... @@ -521,11 +521,11 @@
521 521 <button class="btn btn-sm btn-success" id="laxiconLangRemove">Remove</button>
522 522 </div>
523 523 </div>
524   - <div class="col-sm-6">
525   - <div class="form-group">
526   - <label for="SystemFont" class="font13">Available Lexicon</label>
  524 + <div class="col-sm-6" style="padding-left:13px;padding-right:13px;">
  525 + <div class=" form-group">
  526 + <label for="SystemFont" class="font13">Available Lexicons</label>
527 527 <select class="form-control" size="8" id="lexiconLangDropdown"></select>
528   - </div>
  528 + </div>
529 529 <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
530 530 </div>
531 531 <div class="clearfix"></div>
... ... @@ -1150,7 +1150,7 @@
1150 1150 </tr>
1151 1151 <tr>
1152 1152 <td>
1153   - <button type="submit" ng-disabled="resetPasswordForm.$invalid" ng-click="ResetUserPassword(userInfo)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button> <!--ng-submit="submitForm(resetPwdForm.$valid)"--> <!--ng-click="ResetUserPassword(userInfo)"-->
  1153 + <button type="submit" ng-disabled="resetPasswordForm.$invalid" ng-click="ResetUserPassword(userInfo)" style="background: #0072a7; border: 1px solid #005076; cursor: pointer; color: #fff; padding: 5px 10px; font-size: 16px; text-transform: uppercase; text-align: center; text-decoration: none; font-family: gotham, 'Helvetica Neue', helvetica, arial, sans-serif; " id="btnUpdatePassword">Submit</button> <!--ng-submit="submitForm(resetPwdForm.$valid)"--> <!--ng-click="ResetUserPassword(userInfo)"-->
1154 1154 </td>
1155 1155 </tr>
1156 1156 </tbody>
... ... @@ -1244,56 +1244,55 @@
1244 1244 <div class="panel-body">
1245 1245 <!-- form -->
1246 1246 <form class="form-horizontal">
1247   - <div class="form-group">
  1247 + <div class="form-group" id="moduleDiv1">
1248 1248 <div class="col-sm-8">• Dissectible Anatomy</div>
1249 1249 </div>
1250   - <div class="form-group">
  1250 + <div class="form-group" id="moduleDiv2">
1251 1251 <div class="col-sm-8">• Atlas Anatomy</div>
1252 1252 </div>
1253   - <div class="form-group">
  1253 + <div class="form-group" id="moduleDiv3">
  1254 + <div class="col-sm-8">• 3D Anatomy</div>
  1255 + </div>
  1256 + <div class="form-group" id="moduleDiv4">
1254 1257 <div class="col-sm-8">• Clinical Illustration</div>
1255 1258 </div>
1256   - <div class="form-group">
  1259 + <div class="form-group" id="moduleDiv5">
1257 1260 <div class="col-sm-8">• Clinical Animation</div>
1258 1261 </div>
1259   - <div class="form-group">
1260   - <div class="col-sm-8">• 3D Anatomy</div>
  1262 + <div class="form-group" id="moduleDiv6">
  1263 + <div class="col-sm-8">• Encyclopedia</div>
1261 1264 </div>
1262   - <div class="form-group">
  1265 + <div class="form-group" id="moduleDiv7">
1263 1266 <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div>
1264 1267 </div>
1265   -
1266   - <div class="form-group">
  1268 + <div class="form-group" id="moduleDiv8">
1267 1269 <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div>
1268 1270 </div>
1269   - <div class="form-group">
  1271 + <div class="form-group" id="moduleDiv9">
1270 1272 <div class="col-sm-8">• IP 10</div>
1271 1273 </div>
1272   - <div class="form-group">
  1274 + <div class="form-group" id="moduleDiv10">
1273 1275 <div class="col-sm-8"><i>• Lab Exercise (To be available by 08/16/2017)</i></div>
1274 1276 </div>
1275   - <div class="form-group">
1276   - <div class="col-sm-8">• Encyclopedia</div>
1277   - </div>
1278   - <div class="form-group">
  1277 + <div class="form-group" id="moduleDiv11">
1279 1278 <div class="col-sm-8">• In - Depth Reports</div>
1280 1279 </div>
1281   - <div class="form-group">
  1280 + <div class="form-group" id="moduleDiv12">
1282 1281 <div class="col-sm-8">• Complementary and Alternative Medicine</div>
1283 1282 </div>
1284   - <div class="form-group">
1285   - <div class="col-sm-8">• Health Navigator</div>
1286   - </div>
1287   - <div class="form-group">
1288   - <div class="col-sm-8">• The Wellness Tool</div>
  1283 + <div class="form-group" id="moduleDiv13">
  1284 + <div class="col-sm-8">• A.D.A.M Images</div>
1289 1285 </div>
1290   - <div class="form-group">
  1286 + <div class="form-group" id="moduleDiv14">
1291 1287 <div class="col-sm-8">• Body Guide</div>
1292 1288 </div>
1293   - <div class="form-group">
1294   - <div class="col-sm-8">• A.D.A.M Images</div>
  1289 + <div class="form-group" id="moduleDiv15">
  1290 + <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
1295 1291 </div>
1296   - <div class="form-group">
  1292 + <div class="form-group" id="moduleDiv16">
  1293 + <div class="col-sm-8">• The Wellness Tool</div>
  1294 + </div>
  1295 + <div class="form-group" id="moduleDiv17">
1297 1296 <div class="col-sm-8">• A.D.A.M on Demand</div>
1298 1297 </div>
1299 1298 <div class="form-group">
... ... @@ -1483,7 +1482,7 @@
1483 1482 <!--<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.js"></script>-->
1484 1483 <script src="libs/html2canvas.js"></script>
1485 1484 <script src="libs/FileSaver.js"></script>
1486   - <script src="libs/check_browser_close.js"></script>
  1485 +
1487 1486 <!--<script type="text/javascript">
1488 1487 $(function () {
1489 1488 $('#canvas').sketch();
... ...