ADAM / AIAHTML5

Commit 9ed1a0c04a5bc8163aa4d9c8f01b6691984d7abc

Authored by Amrita Vishnoi
2 parents 752c72e9 5c2fce35

Merge branch 'PendingUserModules' into Develop

Inline Side-by-side
Showing 2 changed files with 73 additions and 51 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @9ed1a0c
@@ -272,6 +272,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -272,6 +272,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
272 272
273 function ShowAssignedModulesPopup(userModules) { 273 function ShowAssignedModulesPopup(userModules) {
274 var allModules = Modules; 274 var allModules = Modules;
  275 + var arrPendingModules = [];
  276 + if ($('#dvPendingModules').length > 0) {
  277 + $('#dvPending').hide();
  278 + }
275 for (var module = 1; module <= allModules.length; module++) { 279 for (var module = 1; module <= allModules.length; module++) {
276 $('#moduleDiv' + module).hide(); 280 $('#moduleDiv' + module).hide();
277 } 281 }
@@ -285,11 +289,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -285,11 +289,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
285 $('#moduleDiv' + userModules[count].id).show(); 289 $('#moduleDiv' + userModules[count].id).show();
286 break; 290 break;
287 } 291 }
  292 +
  293 + if (userModules[count].id == 7)
  294 + arrPendingModules.push(userModules[count].id);
  295 + if (userModules[count].id == 8)
  296 + arrPendingModules.push(userModules[count].id);
  297 + if (userModules[count].id == 10)
  298 + arrPendingModules.push(userModules[count].id);
288 } 299 }
289 } 300 }
290 if (userModules.length > 0) { 301 if (userModules.length > 0) {
291 $('#dvUserModulesInfo').modal('show'); 302 $('#dvUserModulesInfo').modal('show');
292 } 303 }
  304 +
  305 + if (arrPendingModules.length > 0) {
  306 + $('#dvPendingModules').show();
  307 + }
293 } 308 }
294 $rootScope.UpdateLicenseTermStatus = function () { 309 $rootScope.UpdateLicenseTermStatus = function () {
295 $('#dvTermCondition').fadeOut(); 310 $('#dvTermCondition').fadeOut();
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @9ed1a0c
@@ -523,9 +523,9 @@ @@ -523,9 +523,9 @@
523 </div> 523 </div>
524 <div class="col-sm-6" style="padding-left:13px;padding-right:13px;"> 524 <div class="col-sm-6" style="padding-left:13px;padding-right:13px;">
525 <div class=" form-group"> 525 <div class=" form-group">
526 - <label for="SystemFont" class="font13">Available Lexicons</label> 526 + <label for="SystemFont" class="font13">Available Lexicons</label>
527 <select class="form-control" size="8" id="lexiconLangDropdown"></select> 527 <select class="form-control" size="8" id="lexiconLangDropdown"></select>
528 - </div> 528 + </div>
529 <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p> 529 <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
530 </div> 530 </div>
531 <div class="clearfix"></div> 531 <div class="clearfix"></div>
@@ -1244,56 +1244,63 @@ @@ -1244,56 +1244,63 @@
1244 <div class="panel-body"> 1244 <div class="panel-body">
1245 <!-- form --> 1245 <!-- form -->
1246 <form class="form-horizontal"> 1246 <form class="form-horizontal">
1247 - <div class="form-group" id="moduleDiv1">  
1248 - <div class="col-sm-8">• Dissectible Anatomy</div>  
1249 - </div>  
1250 - <div class="form-group" id="moduleDiv2">  
1251 - <div class="col-sm-8">• Atlas Anatomy</div>  
1252 - </div>  
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">  
1257 - <div class="col-sm-8">• Clinical Illustrations</div>  
1258 - </div>  
1259 - <div class="form-group" id="moduleDiv5">  
1260 - <div class="col-sm-8">• Clinical Animations</div>  
1261 - </div>  
1262 - <div class="form-group" id="moduleDiv6">  
1263 - <div class="col-sm-8">• Encyclopedia</div>  
1264 - </div>  
1265 - <div class="form-group" id="moduleDiv7">  
1266 - <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div>  
1267 - </div>  
1268 - <div class="form-group" id="moduleDiv8">  
1269 - <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div>  
1270 - </div>  
1271 - <div class="form-group" id="moduleDiv9">  
1272 - <div class="col-sm-8">• IP 10</div>  
1273 - </div>  
1274 - <div class="form-group" id="moduleDiv10">  
1275 - <div class="col-sm-8"><i>• Lab Exercises (To be available by 08/16/2017)</i></div>  
1276 - </div>  
1277 - <div class="form-group" id="moduleDiv11">  
1278 - <div class="col-sm-8">• In - Depth Reports</div>  
1279 - </div>  
1280 - <div class="form-group" id="moduleDiv12">  
1281 - <div class="col-sm-8">• Complementary and Alternative Medicine</div>  
1282 - </div>  
1283 - <div class="form-group" id="moduleDiv13">  
1284 - <div class="col-sm-8">• A.D.A.M Images</div>  
1285 - </div>  
1286 - <div class="form-group" id="moduleDiv14">  
1287 - <div class="col-sm-8">• Body Guide</div>  
1288 - </div>  
1289 - <div class="form-group" id="moduleDiv15">  
1290 - <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->  
1291 - </div>  
1292 - <div class="form-group" id="moduleDiv16">  
1293 - <div class="col-sm-8">• The Wellness Tools</div> 1247 + <div>
  1248 + <div class="form-group" id="moduleDiv1">
  1249 + <div class="col-sm-8">• Dissectible Anatomy</div>
  1250 + </div>
  1251 + <div class="form-group" id="moduleDiv2">
  1252 + <div class="col-sm-8">• Atlas Anatomy</div>
  1253 + </div>
  1254 + <div class="form-group" id="moduleDiv3">
  1255 + <div class="col-sm-8">• 3D Anatomy</div>
  1256 + </div>
  1257 + <div class="form-group" id="moduleDiv4">
  1258 + <div class="col-sm-8">• Clinical Illustrations</div>
  1259 + </div>
  1260 + <div class="form-group" id="moduleDiv5">
  1261 + <div class="col-sm-8">• Clinical Animations</div>
  1262 + </div>
  1263 + <div class="form-group" id="moduleDiv6">
  1264 + <div class="col-sm-8">• Encyclopedia</div>
  1265 + </div>
  1266 + <div class="form-group" id="moduleDiv9">
  1267 + <div class="col-sm-8">• IP 10</div>
  1268 + </div>
  1269 + <div class="form-group" id="moduleDiv11">
  1270 + <div class="col-sm-8">• In - Depth Reports</div>
  1271 + </div>
  1272 + <div class="form-group" id="moduleDiv12">
  1273 + <div class="col-sm-8">• Complementary and Alternative Medicine</div>
  1274 + </div>
  1275 + <div class="form-group" id="moduleDiv13">
  1276 + <div class="col-sm-8">• A.D.A.M Images</div>
  1277 + </div>
  1278 + <div class="form-group" id="moduleDiv14">
  1279 + <div class="col-sm-8">• Body Guide</div>
  1280 + </div>
  1281 + <div class="form-group" id="moduleDiv15">
  1282 + <div class="col-sm-8">• Symptom Navigator</div> <!--Health-->
  1283 + </div>
  1284 + <div class="form-group" id="moduleDiv16">
  1285 + <div class="col-sm-8">• The Wellness Tools</div>
  1286 + </div>
  1287 + <div class="form-group" id="moduleDiv1017">
  1288 + <div class="col-sm-8">• A.D.A.M on Demand</div>
  1289 + </div>
1294 </div> 1290 </div>
1295 - <div class="form-group" id="moduleDiv1017">  
1296 - <div class="col-sm-8">• A.D.A.M on Demand</div> 1291 + <!--<hr style="border: 1px solid;"/>-->
  1292 + <div id="dvPending" style="margin: 15px 0;"><b>Pending Modules</b></div>
  1293 + <!--<hr style="border: 1px solid;" />-->
  1294 + <div>
  1295 + <div class="form-group" id="moduleDiv7">
  1296 + <div class="col-sm-12"><i>• Curriculum Builder</i></div> <!--(To be available by 09/25/2017)-->
  1297 + </div>
  1298 + <div class="form-group" id="moduleDiv8">
  1299 + <div class="col-sm-8"><i>• Anatomy Test</i></div> <!--(To be available by 08/28/2017)-->
  1300 + </div>
  1301 + <div class="form-group" id="moduleDiv10">
  1302 + <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
  1303 + </div>
1297 </div> 1304 </div>
1298 <div class="form-group"> 1305 <div class="form-group">
1299 <div style="text-align: center"> 1306 <div style="text-align: center">