ADAM / AIAHTML5

Commit d349f2b8e749cf37010f5a57fdd9d10042c2a761

Authored by Amrita Vishnoi
2 parents dba4e561 e2e97be9

Merge branch 'Bug-23238-2' of http://52.6.196.163/ADAM/AIAHTML5 into QA

Inline Side-by-side
Showing 3 changed files with 54 additions and 34 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @d349f2b
@@ -225,7 +225,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -225,7 +225,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
225 $rootScope.isVisibleLogin = false; 225 $rootScope.isVisibleLogin = false;
226 $rootScope.haveRoleAdmin = true; 226 $rootScope.haveRoleAdmin = true;
227 localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); 227 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
228 - $('#dvUserModulesInfo').modal('show'); 228 + ShowAssignedModulesPopup(result.Modules);
229 $location.path('/'); 229 $location.path('/');
230 230
231 } 231 }
@@ -236,7 +236,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -236,7 +236,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
236 $rootScope.isVisibleLogin = false; 236 $rootScope.isVisibleLogin = false;
237 $rootScope.haveRoleAdmin = false; 237 $rootScope.haveRoleAdmin = false;
238 localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); 238 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
239 - $('#dvUserModulesInfo').modal('show'); 239 + ShowAssignedModulesPopup(result.Modules);
240 $location.path('/'); 240 $location.path('/');
241 241
242 } 242 }
@@ -267,6 +267,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -267,6 +267,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
267 $("#messageModal").modal('show'); 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 $rootScope.UpdateLicenseTermStatus = function () { 292 $rootScope.UpdateLicenseTermStatus = function () {
272 $('#dvTermCondition').fadeOut(); 293 $('#dvTermCondition').fadeOut();
@@ -290,7 +311,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -290,7 +311,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
290 $rootScope.isVisibleLogin = false; 311 $rootScope.isVisibleLogin = false;
291 $rootScope.userData = userInfo; 312 $rootScope.userData = userInfo;
292 $rootScope.userModules = userInfo.Modules; 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 @d349f2b
@@ -232,7 +232,7 @@ AIA.constant(&#39;Modules&#39;, [ @@ -232,7 +232,7 @@ AIA.constant(&#39;Modules&#39;, [
232 }, 232 },
233 { 233 {
234 Id: 7, 234 Id: 7,
235 - Name: 'Anatomy Tests', 235 + Name: 'Anatomy Test',
236 }, 236 },
237 { 237 {
238 Id: 8, 238 Id: 8,
@@ -240,11 +240,11 @@ AIA.constant(&#39;Modules&#39;, [ @@ -240,11 +240,11 @@ AIA.constant(&#39;Modules&#39;, [
240 }, 240 },
241 { 241 {
242 Id: 9, 242 Id: 9,
243 - Name: 'ADAM Images', 243 + Name: 'A.D.A.M. Images',
244 }, 244 },
245 { 245 {
246 Id: 10, 246 Id: 10,
247 - Name: 'ADAM On Demand', 247 + Name: 'A.D.A.M. OnDemand',
248 }, 248 },
249 { 249 {
250 Id: 11, 250 Id: 11,
@@ -262,7 +262,7 @@ AIA.constant(&#39;Modules&#39;, [ @@ -262,7 +262,7 @@ AIA.constant(&#39;Modules&#39;, [
262 }, 262 },
263 { 263 {
264 Id: 14, 264 Id: 14,
265 - Name: 'Complementary and Alternative Medicine', 265 + Name: 'CAM', //Complementary and Alternative Medicine'
266 }, 266 },
267 { 267 {
268 Id: 15, 268 Id: 15,
@@ -270,7 +270,7 @@ AIA.constant(&#39;Modules&#39;, [ @@ -270,7 +270,7 @@ AIA.constant(&#39;Modules&#39;, [
270 }, 270 },
271 { 271 {
272 Id: 16, 272 Id: 16,
273 - Name: 'Health Navigator', 273 + Name: 'Symptom Navigator', //Health Navigator',
274 }, 274 },
275 { 275 {
276 Id: 17, 276 Id: 17,
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @d349f2b
@@ -1150,7 +1150,7 @@ @@ -1150,7 +1150,7 @@
1150 </tr> 1150 </tr>
1151 <tr> 1151 <tr>
1152 <td> 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 </td> 1154 </td>
1155 </tr> 1155 </tr>
1156 </tbody> 1156 </tbody>
@@ -1244,56 +1244,55 @@ @@ -1244,56 +1244,55 @@
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"> 1247 + <div class="form-group" id="moduleDiv1">
1248 <div class="col-sm-8">• Dissectible Anatomy</div> 1248 <div class="col-sm-8">• Dissectible Anatomy</div>
1249 </div> 1249 </div>
1250 - <div class="form-group"> 1250 + <div class="form-group" id="moduleDiv2">
1251 <div class="col-sm-8">• Atlas Anatomy</div> 1251 <div class="col-sm-8">• Atlas Anatomy</div>
1252 </div> 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 <div class="col-sm-8">• Clinical Illustration</div> 1257 <div class="col-sm-8">• Clinical Illustration</div>
1255 </div> 1258 </div>
1256 - <div class="form-group"> 1259 + <div class="form-group" id="moduleDiv5">
1257 <div class="col-sm-8">• Clinical Animation</div> 1260 <div class="col-sm-8">• Clinical Animation</div>
1258 </div> 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 </div> 1264 </div>
1262 - <div class="form-group"> 1265 + <div class="form-group" id="moduleDiv7">
1263 <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div> 1266 <div class="col-sm-12"><i>• Curriculum Builder (To be available by 09/25/2017)</i></div>
1264 </div> 1267 </div>
1265 -  
1266 - <div class="form-group"> 1268 + <div class="form-group" id="moduleDiv8">
1267 <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div> 1269 <div class="col-sm-8"><i>• Anatomy Test (To be available by 08/28/2017)</i></div>
1268 </div> 1270 </div>
1269 - <div class="form-group"> 1271 + <div class="form-group" id="moduleDiv9">
1270 <div class="col-sm-8">• IP 10</div> 1272 <div class="col-sm-8">• IP 10</div>
1271 </div> 1273 </div>
1272 - <div class="form-group"> 1274 + <div class="form-group" id="moduleDiv10">
1273 <div class="col-sm-8"><i>• Lab Exercise (To be available by 08/16/2017)</i></div> 1275 <div class="col-sm-8"><i>• Lab Exercise (To be available by 08/16/2017)</i></div>
1274 </div> 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 <div class="col-sm-8">• In - Depth Reports</div> 1278 <div class="col-sm-8">• In - Depth Reports</div>
1280 </div> 1279 </div>
1281 - <div class="form-group"> 1280 + <div class="form-group" id="moduleDiv12">
1282 <div class="col-sm-8">• Complementary and Alternative Medicine</div> 1281 <div class="col-sm-8">• Complementary and Alternative Medicine</div>
1283 </div> 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 </div> 1285 </div>
1290 - <div class="form-group"> 1286 + <div class="form-group" id="moduleDiv14">
1291 <div class="col-sm-8">• Body Guide</div> 1287 <div class="col-sm-8">• Body Guide</div>
1292 </div> 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 </div> 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 <div class="col-sm-8">• A.D.A.M on Demand</div> 1296 <div class="col-sm-8">• A.D.A.M on Demand</div>
1298 </div> 1297 </div>
1299 <div class="form-group"> 1298 <div class="form-group">