ADAM / AIAHTML5

Commit 16f9c60bf06ec791a2eaf7f51aa77b7be9758432

Authored by Birendra
2 parents e8bd0ac6 24f9a93e

Merge branch 'AIABugFixes' into AIA_Develop

Inline Side-by-side
Showing 17 changed files with 436 additions and 275 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
  View file @16f9c60
... ... @@ -4350,6 +4350,7 @@
4350 4350 <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
4351 4351 <Property Type="Boolean" Name="LoginStatus" Nullable="true" />
4352 4352 <Property Type="String" Name="TotalLogin" Nullable="true" MaxLength="50" />
  4353 + <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="7" />
4353 4354 </ComplexType>
4354 4355 <ComplexType Name="usp_GetUserTyeByAccountNumber_Result">
4355 4356 <Property Type="Byte" Name="Id" Nullable="true" />
... ... @@ -6323,6 +6324,7 @@
6323 6324 <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
6324 6325 <ScalarProperty Name="LoginStatus" ColumnName="LoginStatus" />
6325 6326 <ScalarProperty Name="TotalLogin" ColumnName="TotalLogin" />
  6327 + <ScalarProperty Name="LicenseStatus" ColumnName="LicenseStatus" />
6326 6328 </ComplexTypeMapping>
6327 6329 </ResultMapping>
6328 6330 </FunctionImportMapping>
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetUsersList_Result.cs
  View file @16f9c60
... ... @@ -31,5 +31,6 @@ namespace AIAHTML5.ADMIN.API.Entity
31 31 public Nullable<int> EditionTypeId { get; set; }
32 32 public Nullable<bool> LoginStatus { get; set; }
33 33 public string TotalLogin { get; set; }
  34 + public string LicenseStatus { get; set; }
34 35 }
35 36 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @16f9c60
... ... @@ -518,38 +518,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
518 518  
519 519 $timeout(function () {
520 520 $scope.EnableUI();
521   - $scope.ResetGridListLength();
  521 + $rootScope.ResetGridListLength();
522 522 }, 500);
523 523  
524 524 }
525 525  
526 526  
527   - $scope.ResetGridListLength=function()
  527 + $rootScope.ResetGridListLength=function()
528 528 {
529 529 var $ua = navigator.userAgent;
530 530  
531 531 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
532 532  
533   - if(screen.height<=768)
534   - {
535   - $('#grid-view').css({"height":"505","overflow":"scroll"});
536   - $('#ListViewDiv').css({"height":"260","overflow":"scroll"});
537   - }
538   - else if(screen.height<=1024)
539   - {
540   - $('#grid-view').css({"height":"720","overflow":"scroll"});
541   - $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
542   - }
543   - else
544   - {
545   - $('#grid-view').css({"height":"950","overflow":"scroll"});
546   - $('#ListViewDiv').css({"height":"850","overflow":"scroll"});
547   - }
  533 + var srchHeight=$('.breadcrumb').height();
  534 + var gridheight=screen.height-srchHeight-132;
  535 + var listheight=screen.height-srchHeight-356;
  536 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  537 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
548 538 }
549 539 else
550 540 {
551   - $('#grid-view').css({"height":"670","overflow":"scroll"});
552   - $('#ListViewDiv').css({"height":"450","overflow":"scroll"});
  541 + var srchHeight=$('.breadcrumb').height();
  542 + var gridheight=screen.height-srchHeight-281;
  543 + var listheight=screen.height-srchHeight-504;
  544 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  545 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
553 546 }
554 547 }
555 548 $scope.IsVisible = function () {
... ... @@ -789,7 +782,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
789 782  
790 783 $timeout(function () {
791 784 $scope.EnableUI();
792   - $scope.ResetGridListLength();
  785 + $rootScope.ResetGridListLength();
793 786 }, 500);
794 787  
795 788 }
... ... @@ -933,7 +926,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
933 926  
934 927 $timeout(function () {
935 928 $scope.EnableUI();
936   - $scope.ResetGridListLength();
  929 + $rootScope.ResetGridListLength();
937 930 }, 500);
938 931 }
939 932  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @16f9c60
... ... @@ -233,33 +233,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
233 233  
234 234 $timeout(function () {
235 235 $scope.EnableUI();
236   - $scope.ResetGridListLength();
  236 + $rootScope.ResetGridListLength();
237 237 }, 400);
238 238  
239 239 }
240   - $scope.ResetGridListLength=function()
  240 + $rootScope.ResetGridListLength=function()
241 241 {
242 242 var $ua = navigator.userAgent;
243 243  
244 244 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
245 245  
246   - if(screen.height<=768)
247   - {
248   - $('#grid-view').css({"height":"660","overflow":"scroll"});
249   - }
250   - else if(screen.height<=1024)
251   - {
252   - $('#grid-view').css({"height":"910","overflow":"scroll"});
253   - }
254   - else
255   - {
256   - $('#grid-view').css({"height":"1250","overflow":"scroll"});
257   - }
  246 + var gridheight=screen.height-107;
  247 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  248 +
258 249 }
259 250 else
260 251 {
261   - $('#grid-view').css({"height":"830","overflow":"scroll"});
  252 + var gridheight=screen.height-252;
  253 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  254 +
262 255 }
  256 +
263 257 }
264 258  
265 259 $scope.openView = function ($event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @16f9c60
... ... @@ -11,6 +11,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
11 11 $scope.SelectedCAImage = [];
12 12 $scope.SelectedCASummary = [];
13 13 $scope.filterstring = false;
  14 + $scope.islinkActive = false;
14 15 $scope.hostedServer = "https://ssl.adam.com/graphics/Multimedia/en/";
15 16 $scope.hostedFolderId;
16 17 $scope.idSelected;
... ... @@ -164,7 +165,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
164 165 if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.id!=null)
165 166 {
166 167 if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!="")
167   - {
  168 + {
168 169 $rootScope.isCallFromOtherModule = true;
169 170 $rootScope.linkToOpenCa=true;
170 171 // store exist module in module service
... ... @@ -182,33 +183,44 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
182 183 .from(result.root.CAData)
183 184 .where('_id = ' + $rootScope.siteUrlInfo.id)
184 185 .select('_Title');
185   -
186   - var CAlinkData = {
187   - "id": $rootScope.siteUrlInfo.id,
188   - "mType": 'CLINICAL_ANIMATIONS',
189   - "textVisible": true,
190   - "windowTitle": AnimationTitle[0]._Title,
191   -
192   - };
193   - ModuleService.setModuleData(CAlinkData, 0);
194   - // close/remove prev panel when in minimised mode
195   -
196   - if($rootScope.CAWindowData!=undefined)
  186 +
  187 + if(AnimationTitle.length>0)
197 188 {
198   - if($rootScope.CAWindowData.length>0)
  189 + var CAlinkData = {
  190 + "id": $rootScope.siteUrlInfo.id,
  191 + "mType": 'CLINICAL_ANIMATIONS',
  192 + "textVisible": true,
  193 + "maximised": true,
  194 + "windowTitle": AnimationTitle[0]._Title,
  195 +
  196 + };
  197 +
  198 + ModuleService.setModuleData(CAlinkData, 0);
  199 + // close/remove prev panel when in minimised mode
  200 +
  201 + if($rootScope.CAWindowData!=undefined)
199 202 {
200   - for(var x=0 ;x < $rootScope.CAWindowData.length;x++){
201   - var winid=$rootScope.CAWindowData[x].multiwinid;
202   - if ($('#caImagePanel_' + winid).html() != undefined) {
203   - $('#caImagePanel_' + winid).remove();
204   - }
  203 + if($rootScope.CAWindowData.length>0)
  204 + {
  205 + for(var x=0 ;x < $rootScope.CAWindowData.length;x++){
  206 + var winid=$rootScope.CAWindowData[x].multiwinid;
  207 + if ($('#caImagePanel_' + winid).html() != undefined) {
  208 + $('#caImagePanel_' + winid).remove();
  209 + }
  210 + }
  211 + $rootScope.CAWindowData=[];
205 212 }
206   - $rootScope.CAWindowData=[];
207 213 }
  214 +
  215 + $location.url('/clinical-animations-detail');
208 216 }
209   -
210   - $location.url('/clinical-animations-detail');
211   -
  217 + else
  218 + {
  219 + $('#errorMessage').text("Animation course not found. Please try again!");
  220 + $("#messageModal").modal('show');
  221 +
  222 + }
  223 +
212 224 },
213 225 function (error) {
214 226 $scope.EnableUI();
... ... @@ -228,6 +240,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
228 240 };
229 241 $scope.loadCAlist = function () {
230 242 $rootScope.isCallFromOtherModule = undefined;
  243 + $('.breadcrumb').css('display','block');
  244 + $('.tab-content').css('display','block');
231 245  
232 246 $rootScope.MULTI_VIEW_ID += 1
233 247 // store exist module in module service
... ... @@ -369,31 +383,46 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
369 383  
370 384 var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')
371 385 promise.then(
372   - function (result) {
  386 + function (result) {
  387 +
  388 + if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
  389 + {
  390 + $scope.islinkActive = true;
  391 + var AnimationData = new jinqJs()
  392 + .from(result.root.CAData)
  393 + .orderBy([{ field: '_Title', sort: 'asc' }])
  394 + .select('_id','_BodyRegion','_BodySystem','_ImageId','_LowerSummary','_MedicalSpecialty','_Summary','_ThumbnailImage','_Title','_Video','copyLink');
373 395  
374   - var AnimationData = new jinqJs()
375   - .from(result.root.CAData)
376   - .orderBy([{ field: '_Title', sort: 'asc' }])
377   - .select();
  396 + angular.forEach(AnimationData, function (value, key) {
378 397  
379   - $scope.SetCAwindowStoreData(windowviewid, 'AnimationData', AnimationData);
  398 + AnimationData[key].copyLink=$rootScope.homeURL+'?username='+$rootScope.userData.LoginId+'&accountNumber='+$rootScope.userData.LicenseInfo.AccountNumber.trim()+'&mtype=CA&id='+value._id;
380 399  
381   - $scope.selectedCAListViewData = AnimationData;
  400 + });
  401 +
  402 + }
  403 + else
  404 + {
  405 + var AnimationData = new jinqJs()
  406 + .from(result.root.CAData)
  407 + .orderBy([{ field: '_Title', sort: 'asc' }])
  408 + .select();
  409 + }
  410 + $scope.SetCAwindowStoreData(windowviewid, 'AnimationData', AnimationData);
382 411  
  412 + $scope.selectedCAListViewData = AnimationData;
383 413  
384   - },
385   - function (error) {
386   - $scope.EnableUI();
387   - // handle errors here
388   - console.log(' $scope.AnimationData = ' + error.statusText);
389   - }
390   - );
391 414  
  415 + },
  416 + function (error) {
  417 + $scope.EnableUI();
  418 + // handle errors here
  419 + console.log(' $scope.AnimationData = ' + error.statusText);
  420 + });
392 421  
393 422 };
394 423  
395 424 $scope.loadAllCA = function (windowviewid) {
396   -
  425 +
397 426 $scope.selectedCAListViewData = $scope.GetCAwindowStoreData(windowviewid, 'AnimationData');
398 427  
399 428 $('#grid-view').empty();
... ... @@ -401,12 +430,37 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
401 430 angular.forEach($scope.selectedCAListViewData, function (value, key) {
402 431 var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
403 432  
404   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "'+ value._Title + '" data-ng-click="openView($event)">'
405   - + '<div class="thumbnail" ><a href="#">'
406   - + '<img class="tinyImg" style="height:160px !important; width:100%!important" id="' + value._Title + '" ng-src="' + imagePath + '" alt="" title="" >'
407   - + '<div class="caption" style="padding:0px"><p>'+'('+ value._id+') ' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  433 + if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
  434 + {
  435 + var $el = $('<div class="col-sm-3 col-lg-2">'
  436 + +'<div id="' + value._id + '" title = "'+ value._Title + '" data-ng-click="openView($event)">'
  437 + + '<div class="thumbnail" style="margin-bottom:0px!important;">'
  438 + +'<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
  439 + + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
  440 + +'</div></a></div></div>'
  441 + +'<div class="thumbnail tooltipbtn" style="height:23px; padding:0px !important">'
  442 + +'<button id="copybtn_' + value._id + '" data-clipboard-text="'+value.copyLink+'" onclick="copygridbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>'
  443 + +'<span id="spn_' + value._id + '" class="tooltiptext"></span></div>'
  444 +
  445 + +'</div>').appendTo('#grid-view');
  446 +
  447 + $compile($el)($scope);
  448 + }
  449 + else
  450 + {
  451 + //site license and super admin section
  452 + //site license not has loginId and super admin not has accountNumber
  453 + var $el = $('<div class="col-sm-3 col-lg-2">'
  454 + +'<div id="' + value._id + '" title = "'+ value._Title + '" data-ng-click="openView($event)">'
  455 + + '<div class="thumbnail">'
  456 + +'<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
  457 + + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
  458 + +'</div></a></div></div>'
  459 + +'</div>').appendTo('#grid-view');
  460 + $compile($el)($scope);
  461 + }
408 462  
409   - $compile($el)($scope);
  463 +
410 464  
411 465 $(".sidebar").mCustomScrollbar({
412 466 autoHideScrollbar: true,
... ... @@ -427,7 +481,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
427 481  
428 482 $timeout(function () {
429 483 $scope.EnableUI();
430   - $scope.ResetGridListLength();
  484 + $rootScope.ResetGridListLength();
431 485 }, 400);
432 486  
433 487 }
... ... @@ -618,22 +672,42 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
618 672 if (selectimg === true && count >= filtercount) {
619 673  
620 674  
621   - $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
622   -
623   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
624   - + '<div class="thumbnail" ><a href="#">'
625   - + '<img class="tinyImg" style="height:160px !important;width:100%!important" id="' + value._Title + '" ng-src="' + $scope.imagePath + '" alt="" title="" >'
626   - + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
627   -
  675 + var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
  676 + if($rootScope.userData.Id>1 && $rootScope.userData.LicenseInfo!= null && $rootScope.userData.EditionId<=2)
  677 + {
  678 + var $el = $('<div class="col-sm-3 col-lg-2">'
  679 + +'<div id="' + value._id + '" title = "'+ value._Title + '" data-ng-click="openView($event)">'
  680 + + '<div class="thumbnail" style="margin-bottom:0px!important;">'
  681 + + '<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
  682 + + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
  683 + +'</div></a></div></div>'
  684 + +'<div class="thumbnail tooltipbtn" style="height:23px; padding:0px !important">'
  685 + +'<button id="copybtn_' + value._id + '" data-clipboard-text="'+value.copyLink+'" onclick="copygridbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>'
  686 + +'<span id="spn_' + value._id + '" class="tooltiptext"></span></div>'
  687 +
  688 + +'</div>').appendTo('#grid-view');
628 689  
629 690 $compile($el)($scope);
  691 + }
  692 + else
  693 + {
  694 + //site license and super admin section
  695 + //site license not has loginId and super admin not has accountNumber
  696 + var $el = $('<div class="col-sm-3 col-lg-2">'
  697 + +'<div id="' + value._id + '" title = "'+ value._Title + '" data-ng-click="openView($event)">'
  698 + + '<div class="thumbnail">'
  699 + + '<a href="#"><img id="' + value._Title + '" class="img-responsive" style="height:160px !important; width:100%!important;" ng-src="' + imagePath + '" alt="" title="" >'
  700 + + '<div class="caption" style="padding:0px;height:42px"><p style="white-space:pre-wrap;height:40px">' + value._Title + '</p>'
  701 + +'</div></a></div></div>'
  702 + +'</div>').appendTo('#grid-view');
  703 + $compile($el)($scope);
  704 + }
630 705  
631 706 $(".sidebar").mCustomScrollbar({
632 707 autoHideScrollbar: true,
633 708 //theme:"rounded"
634 709 });
635 710  
636   -
637 711 calistviewdata.push(
638 712 {
639 713 "_id": value._id,
... ... @@ -667,36 +741,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
667 741  
668 742 $timeout(function () {
669 743 $scope.EnableUI();
670   - $scope.ResetGridListLength();
  744 + $rootScope.ResetGridListLength();
671 745 }, 500);
672 746 }
673 747  
674   - $scope.ResetGridListLength=function()
  748 + $rootScope.ResetGridListLength=function()
675 749 {
676 750 var $ua = navigator.userAgent;
677 751  
678 752 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
679 753  
680   - if(screen.height<=768)
681   - {
682   - $('#grid-view').css({"height":"535","overflow":"scroll"});
683   - $('#ListViewDiv').css({"height":"290","overflow":"scroll"});
684   - }
685   - else if(screen.height<=1024)
686   - {
687   - $('#grid-view').css({"height":"780","overflow":"scroll"});
688   - $('#ListViewDiv').css({"height":"530","overflow":"scroll"});
689   - }
690   - else
691   - {
692   - $('#grid-view').css({"height":"950","overflow":"scroll"});
693   - $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
694   - }
  754 + var srchHeight=$('.breadcrumb').height();
  755 + var gridheight=screen.height-srchHeight-128;
  756 + var listheight=screen.height-srchHeight-352;
  757 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  758 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
695 759 }
696 760 else
697 761 {
698   - $('#grid-view').css({"height":"696","overflow":"scroll"});
699   - $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
  762 + var srchHeight=$('.breadcrumb').height();
  763 + var gridheight=screen.height-srchHeight-276;
  764 + var listheight=screen.height-srchHeight-500;
  765 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  766 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
700 767 }
701 768 }
702 769 $scope.scroll = function () {
... ... @@ -944,13 +1011,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
944 1011 if ($rootScope.isCallFromOtherModule) {
945 1012 if($rootScope.linkToOpenCa==true)
946 1013 {
947   - $scope.jsPanelWidth = $(window).outerWidth() - 10;
  1014 + $scope.jsPanelWidth = $(window).outerWidth()-30;
948 1015 $scope.jsPanelHeight = $(window).outerHeight() - 105;
949 1016 $scope.jsPanelLeft = 1;
950   - $scope.jsPanelTop = 70;
951   - $rootScope.siteUrlInfo.mtype=null;
952   - $rootScope.siteUrlInfo.id=null;
953   -
  1017 + $scope.jsPanelTop = 55;
954 1018 }
955 1019 else
956 1020 {
... ... @@ -1310,12 +1374,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1310 1374  
1311 1375 function videoOnLoad(event) {
1312 1376  
1313   - console.log('video loaded')
1314   - var scope = angular.element(document.getElementById("CAView")).scope();
1315   - // var len = (event.target.id).split("_").length;
1316   - var windowviewid = (event.target.id).split("_")[1];
1317 1377 setTimeout(function()
1318 1378 {
  1379 + var scope = angular.element(document.getElementById("CAView")).scope();
  1380 + // var len = (event.target.id).split("_").length;
  1381 + var windowviewid = (event.target.id).split("_")[1];
1319 1382 scope.$apply(function () {
1320 1383 scope.videoOnLoad(windowviewid);
1321 1384 });
... ... @@ -1332,3 +1395,72 @@ function GetTextVisibityCA(event) {
1332 1395 scope.GetTextVisiblity(windowviewid, btnTextValue);
1333 1396 });
1334 1397 }
  1398 +
  1399 +function copygridbtnclick(event)
  1400 +{
  1401 + var id = (event.target.id).split("_")[1];
  1402 +
  1403 + function setTooltip(message) {
  1404 +
  1405 + $('#spn_'+id).css({'visibility':'visible','margin-left':'0px','opacity':1});
  1406 + $('#spn_'+id).text(message);
  1407 +
  1408 + }
  1409 +
  1410 + function hideTooltip() {
  1411 + setTimeout(function() {
  1412 + $('#spn_'+id).css({'visibility':'hidden','margin-left':'-50px','opacity':0});
  1413 + $('#spn_'+id).text('');
  1414 + }, 2000);
  1415 + }
  1416 +
  1417 + var clipboard = new ClipboardJS('#'+event.target.id);
  1418 +
  1419 + clipboard.on('success', function(e) {
  1420 + setTooltip('link copied!');
  1421 + hideTooltip();
  1422 +
  1423 + });
  1424 +
  1425 + clipboard.on('error', function(e) {
  1426 + setTooltip('link not copied!');
  1427 + hideTooltip();
  1428 +
  1429 + });
  1430 +
  1431 +}
  1432 +
  1433 +function copylistbtnclick(event)
  1434 +{
  1435 + var id = (event.target.id).split("_")[1];
  1436 +
  1437 + function setTooltip(message) {
  1438 +
  1439 + $('#spnlist_'+id).css({'visibility':'visible','opacity':1});
  1440 + $('#spnlist_'+id).text(message);
  1441 +
  1442 + }
  1443 +
  1444 + function hideTooltip() {
  1445 + setTimeout(function() {
  1446 + $('#spnlist_'+id).css({'visibility':'hidden','opacity':0});
  1447 + $('#spnlist_'+id).text('');
  1448 + }, 2000);
  1449 + }
  1450 +
  1451 + var clipboard = new ClipboardJS('#'+event.target.id);
  1452 +
  1453 + clipboard.on('success', function(e) {
  1454 + setTooltip('link copied!');
  1455 + hideTooltip();
  1456 +
  1457 + });
  1458 +
  1459 + clipboard.on('error', function(e) {
  1460 + setTooltip('link not copied!');
  1461 + hideTooltip();
  1462 +
  1463 + });
  1464 +
  1465 +
  1466 +}
1335 1467 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @16f9c60
... ... @@ -396,7 +396,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
396 396  
397 397 $timeout(function () {
398 398 $scope.EnableUI();
399   - $scope.ResetGridListLength();
  399 + $rootScope.ResetGridListLength();
400 400 }, 400);
401 401  
402 402 }
... ... @@ -687,36 +687,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
687 687  
688 688 $timeout(function () {
689 689 $scope.EnableUI();
690   - $scope.ResetGridListLength();
  690 + $rootScope.ResetGridListLength();
691 691 }, 400);
692 692 }
693 693  
694   - $scope.ResetGridListLength=function()
  694 + $rootScope.ResetGridListLength=function()
695 695 {
696 696 var $ua = navigator.userAgent;
697 697  
698 698 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
699 699  
700   - if(screen.height<=768)
701   - {
702   - $('#grid-view').css({"height":"535","overflow":"scroll"});
703   - $('#ListViewDiv').css({"height":"290","overflow":"scroll"});
704   - }
705   - else if(screen.height<=1024)
706   - {
707   - $('#grid-view').css({"height":"720","overflow":"scroll"});
708   - $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
709   - }
710   - else
711   - {
712   - $('#grid-view').css({"height":"950","overflow":"scroll"});
713   - $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
714   - }
  700 + var srchHeight=$('.breadcrumb').height();
  701 + var gridheight=screen.height-srchHeight-128;
  702 + var listheight=screen.height-srchHeight-352;
  703 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  704 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
715 705 }
716 706 else
717 707 {
718   - $('#grid-view').css({"height":"696","overflow":"scroll"});
719   - $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
  708 + var srchHeight=$('.breadcrumb').height();
  709 + var gridheight=screen.height-srchHeight-276;
  710 + var listheight=screen.height-srchHeight-500;
  711 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  712 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
720 713 }
721 714 }
722 715  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @16f9c60
... ... @@ -649,7 +649,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
649 649  
650 650 $rootScope.checkRefreshButtonClick = 1;
651 651 var date = new Date();
652   -
653 652 $rootScope.userInfo = {
654 653 username: null,
655 654 password: null,
... ... @@ -727,13 +726,28 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
727 726  
728 727 //licenseId would be zero for admin/gernal admin
729 728 var isadminType=loggedInUser.LicenseId==0?true:false;
730   - $scope.checkuserstatus = {
731   - userId: userId,
732   - tagName: loggedInUser.Id==0?'logout':'update',
733   - SessionId:loggedInUser.SessionId,
734   - isSiteUser:loggedInUser.isSiteUser,
735   - isAdmin:isadminType
736   - }
  729 + if(loggedInUser.mtype!=undefined)
  730 + {
  731 + $scope.checkuserstatus = {
  732 + userId: userId,
  733 + tagName: loggedInUser.mtype.toLowerCase()=='ca'?'logout':'update',
  734 + SessionId:loggedInUser.SessionId,
  735 + isSiteUser:loggedInUser.isSiteUser,
  736 + isAdmin:isadminType
  737 + }
  738 + }
  739 + else
  740 + {
  741 + $scope.checkuserstatus = {
  742 + userId: userId,
  743 + tagName: loggedInUser.Id==0?'logout':'update',
  744 + SessionId:loggedInUser.SessionId,
  745 + isSiteUser:loggedInUser.isSiteUser,
  746 + isAdmin:isadminType
  747 + }
  748 +
  749 + }
  750 +
737 751  
738 752 // this case found when browser closed by user after login. after long time (after 20 min) open site again
739 753 // loggedInUserDetails contain user detail so user auto login but it is logout by
... ... @@ -987,6 +1001,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
987 1001  
988 1002 }
989 1003 $rootScope.AuthenticateUser = function (userInfo) {
  1004 + $rootScope.isCAlink=false;
990 1005 if (navigator.cookieEnabled) {
991 1006 $('#errorMessage').text("");
992 1007 if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) {
... ... @@ -1018,6 +1033,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1018 1033 result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
1019 1034 result.aiaPingInterval=$rootScope.aiaPingInterval;
1020 1035 result.SessionId=userInfo.SessionId;
  1036 + if(userInfo.mtype!=undefined)
  1037 + {
  1038 + //for CA bypass login
  1039 + result.mtype=userInfo.mtype;
  1040 + }
1021 1041  
1022 1042 //display user name
1023 1043 $rootScope.userName=result.FirstName+" "+result.LastName;
... ... @@ -1381,12 +1401,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1381 1401 }
1382 1402  
1383 1403 $scope.RedirectToModule = function () {
1384   -
1385   - if($rootScope.siteUrlInfo.mtype!=null)
  1404 + if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.id!=null)
1386 1405 {
1387   - if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca')
1388   - {
  1406 + if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!="")
  1407 + {
1389 1408 $('#clinical-animations').trigger('click');
  1409 + $rootScope.isCAlink=true;
1390 1410 }
1391 1411  
1392 1412 }
... ... @@ -1431,27 +1451,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1431 1451 $rootScope.siteUrlInfo.accountNumber = paramInfo[1];
1432 1452 console.log("$rootScope.siteUrlInfo.accountNumber" + $rootScope.siteUrlInfo.accountNumber);
1433 1453 }
1434   -
1435   -
1436   - // if (paramInfo[0] == 'calsCredantial') {
1437   -
1438   - // $rootScope.siteUrlInfo.calsCreds = paramInfo[1];
1439   - // console.log("$rootScope.siteUrlInfo.calsCreds" + $rootScope.siteUrlInfo.calsCreds);
1440   - // }
1441   - // else if (paramInfo[0] == 'username') {
1442 1454  
1443   - // $rootScope.siteUrlInfo.username = paramInfo[1];
1444   - // console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.username);
1445   - // }
1446   - // else if (paramInfo[0] == 'password') {
1447   -
1448   - // $rootScope.siteUrlInfo.password = paramInfo[1];
1449   - // console.log("$rootScope.siteUrlInfo.password " + $rootScope.siteUrlInfo.password);
1450   - // }
1451   -
1452   - //$rootScope.userInfo.username = $rootScope.siteUrlInfo.userId;
1453   - //$rootScope.userInfo.password = $rootScope.siteUrlInfo.password;
1454   -
1455 1455 }
1456 1456 else {
1457 1457 var paramInfo = siteInfo[i].split('=');
... ... @@ -1485,7 +1485,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1485 1485 }
1486 1486 }
1487 1487 if (isCalsCredantialForSIte == "True") {
1488   - if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
  1488 + if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!=null && $rootScope.siteUrlInfo.id!="" && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
1489 1489 {
1490 1490 $rootScope.LoginDisableUI();
1491 1491 var userInfo=$rootScope.userInfo;//also get session id
... ... @@ -1508,6 +1508,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1508 1508  
1509 1509 userInfo.username = result.LoginId;
1510 1510 userInfo.password = result.Password;
  1511 + userInfo.mtype = $rootScope.siteUrlInfo.mtype;
1511 1512 var loggedInUser = JSON.parse($scope.currentUserDetails);
1512 1513 if(loggedInUser!==null && loggedInUser.LoginId==result.LoginId)
1513 1514 {
... ... @@ -1538,7 +1539,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1538 1539 {
1539 1540 console.log(' invalid detail in bypass login');
1540 1541 $rootScope.isVisibleLogin = true;
1541   - $('#errorMessage').text("authentication is not allowed due to invalid details format .\nPlease pass the correct details again!");
  1542 + $('#errorMessage').text("authentication is not allowed due to invalid details format.\nPlease pass the correct details again!");
1542 1543 $("#messageModal").modal('show');
1543 1544 }
1544 1545  
... ... @@ -1581,6 +1582,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1581 1582  
1582 1583 $rootScope.AuthenticateClientSiteUser = function (siteInfo) {
1583 1584 $rootScope.LoginDisableUI();
  1585 + $rootScope.isCAlink=false;
1584 1586 AuthenticationService.validateClientSite(siteInfo)
1585 1587 .then(
1586 1588 function (result) {
... ... @@ -2392,6 +2394,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2392 2394 }
2393 2395  
2394 2396 }
  2397 + if(($location.url()== "/tile-view-list") ||($location.url()== "/clinical-illustrations")||($location.url()== "/clinical-animations")||($location.url()== "/ADAM-images")||($location.url()== "/ADAM-on-demand")) {
  2398 + $rootScope.ResetGridListLength();
  2399 + }
  2400 +
2395 2401 };
2396 2402  
2397 2403  
... ... @@ -3158,7 +3164,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3158 3164 var modulePanel = $(document).find("div[id*='ImagePanel']");
3159 3165 if (modulePanel != undefined && modulePanel.length>0) {
3160 3166 //if only one module left
3161   - if(modulePanel.length==1) $location.url('/' + slug);
  3167 + if(slug=='clinical-animations' && $rootScope.userData.mtype!=undefined)
  3168 + {
  3169 + if($rootScope.userData.mtype.toLowerCase()=='ca')
  3170 + {
  3171 + $rootScope.siteUrlInfo.mtype=null;
  3172 + $rootScope.siteUrlInfo.id=null;
  3173 + $rootScope.LogoutUser();
  3174 + }
  3175 +
  3176 + }
  3177 + else
  3178 + {
  3179 + if(modulePanel.length==1) $location.url('/' + slug);
  3180 + }
  3181 +
3162 3182 }
3163 3183 }
3164 3184  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @16f9c60
... ... @@ -415,7 +415,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
415 415 var OpenItemImagePath = "../../../content/images/aa/images/" +OpenedTileData[3];
416 416 $scope.SetAAwindowStoreData(windowviewid,'OpenItemImagePath',OpenItemImagePath);
417 417 $rootScope.listArray.push({ "imageName": OpenItemImagePath, "text": moduleItemDataToBeSaved });
418   - $("#viewList").append("<div class='col-xs-12 text-center' style='padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:10px;background-color:#fff;height:178px'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
  418 + $("#viewList").append("<div class='col-sm-12 text-center' style='padding: 0px 5px 0px 10px;' id='demoView'><div class='col-xs-12' style='padding:1px;background-color:#fff;height:178px'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:20px;bottom:10px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
419 419 }
420 420  
421 421 $rootScope.openAAModuleItemMain = function () {
... ... @@ -1670,7 +1670,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1670 1670  
1671 1671 $timeout(function () {
1672 1672 $scope.EnableUI();
1673   - $scope.ResetGridListLength();
  1673 + $rootScope.ResetGridListLength();
1674 1674 }, 500);
1675 1675 },
1676 1676 function (error) {
... ... @@ -1680,34 +1680,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1680 1680 )
1681 1681 }
1682 1682  
1683   - $scope.ResetGridListLength=function()
  1683 + $rootScope.ResetGridListLength=function()
1684 1684 {
1685 1685 var $ua = navigator.userAgent;
1686 1686  
1687   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1687 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
1688 1688  
1689   - if(screen.height<=768)
1690   - {
1691   - $('#ListViewDiv').css({"height":"300","overflow":"scroll"});
1692   - $('#grid-view').css({"height":"535","overflow":"scroll"});
1693   - }
1694   - else if(screen.height<=1024)
1695   - {
1696   - $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
1697   - $('#grid-view').css({"height":"720","overflow":"scroll"});
1698   - }
1699   - else
1700   - {
1701   - $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
1702   - $('#grid-view').css({"height":"950","overflow":"scroll"});
1703   - }
1704   -
1705   - }
1706   - else
1707   - {
1708   - $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
1709   - $('#grid-view').css({"height":"696","overflow":"scroll"});
1710   - }
  1689 + var srchHeight=$('.breadcrumb').height();
  1690 + var gridheight=screen.height-srchHeight-128;
  1691 + var listheight=screen.height-srchHeight-352;
  1692 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  1693 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
  1694 + }
  1695 + else
  1696 + {
  1697 + var srchHeight=$('.breadcrumb').height();
  1698 + var gridheight=screen.height-srchHeight-276;
  1699 + var listheight=screen.height-srchHeight-500;
  1700 + $('#grid-view').css({"height":gridheight,"overflow":"auto"});
  1701 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
  1702 + }
1711 1703  
1712 1704 }
1713 1705  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
  View file @16f9c60
... ... @@ -81,37 +81,23 @@
81 81 </tbody>
82 82 </table>
83 83 </div>
84   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
85   - <div class="row well" style="margin-bottom: 0px;">
  84 + <div class="col-xs-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
  85 + <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
86 86 <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
87 87 <div class="thumbnail no-margin">
88   - <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)" style="height:150px">
  88 + <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)" style="height:160px">
89 89 </div>
90 90 </div>
91   - <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
92   - <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
  91 + <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
  92 + <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
93 93 <p ng-bind-html="SelectedAISummary"></p>
94 94 </div>
95   - <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)">Open</button>
  95 + <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)" style="font-size: 14px;">Open</button>
96 96 </div>
97 97  
98 98 </div>
99 99  
100 100 </div>
101   - <!-- <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;">
102   - <div class="row well">
103   - <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
104   - <div class="thumbnail no-margin">
105   - <img id="{{SelectedAIId}}" src="{{SelectedAIthumbImage}}" alt="" title="{{SelectedAITitle}}" data-ng-click="OpenAdamImage($event)">
106   - </div>
107   - </div>
108   - <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
109   - <p class="f11" ng-bind-html="SelectedCISummary"></p>
110   - <button id="{{SelectedAIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="OpenAdamImage($event)">Open</button>
111   - </div>
112   - </div>
113   -
114   - </div> -->
115 101 </div>
116 102 </div>
117 103 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @16f9c60
... ... @@ -3,11 +3,10 @@
3 3 <div ng-include="'app/widget/MainMenu.html'" />
4 4 <div class="main" ng-init="loadAIModuleById(5)">
5 5 <div class="col-sm-12 stickey-area clsstickydiv" style="padding-left:25px; width:100%">
6   - <div class="breadcrumb">
  6 + <div class="breadcrumb" style="display:none">
7 7 <div class="row center-block">
8 8 <h5 class="text-center text-primary txt-white f15">Display Animation By</h5>
9   - <div class="col-md-2 hidden-sm hidden-xs visible-md visible-lg">&nbsp;</div>
10   - <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
  9 + <div class="col-md-3 col-lg-2 col-lg-offset-1 col-sm-3 pad-lftrgt3">
11 10 <div class="form-group">
12 11 <h6 class="text-center text-primary txt-white f11">Body Region</h6>
13 12 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodyregion" ng-options="item for item in CAAllBodyRegion track by item">
... ... @@ -15,7 +14,7 @@
15 14 </select>
16 15 </div>
17 16 </div>
18   - <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
  17 + <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
19 18 <div class="form-group">
20 19 <h6 class="text-center text-primary txt-white f11">Body System</h6>
21 20 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedbodysystem" ng-options="item for item in CAAllBodySystem track by item">
... ... @@ -23,7 +22,7 @@
23 22 </select>
24 23 </div>
25 24 </div>
26   - <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
  25 + <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
27 26 <div class="form-group">
28 27 <h6 class="text-center text-primary txt-white f11">Medical Specialty</h6>
29 28 <select class="form-control input-sm" ng-change="hideListViewDiv()" ng-model="query.selectedspecialty" ng-options="item for item in CAAllSpeciality track by item">
... ... @@ -31,7 +30,7 @@
31 30 </select>
32 31 </div>
33 32 </div>
34   - <div class="col-md-2 col-xs-6 col-sm-3 pad-lftrgt3">
  33 + <div class="col-md-3 col-lg-2 col-sm-3 pad-lftrgt3">
35 34 <div class="form-group">
36 35  
37 36 <div class="col-xs-12" style="padding:0;">
... ... @@ -47,14 +46,12 @@
47 46 </div>
48 47 </div>
49 48  
50   -
51   - <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
52 49 </div>
53 50 </div>
54 51 </div>
55 52 </div>
56 53  
57   - <div class="row tab-content">
  54 + <div class="row tab-content" style="display:none">
58 55 <div class="customTable" role="tabpanel" class="tab-pane active" id="grid-view">
59 56 </div>
60 57 <div class="customTable" role="tabpanel" id="list-view">
... ... @@ -62,61 +59,70 @@
62 59 <table class="table table-hover table-fixed bg-white table-txt12">
63 60 <thead class="clsthead">
64 61 <tr class="active" style="background:#f5f5f5;">
65   - <th width="25%">Title</th>
  62 + <th width="20%">Title</th>
66 63 <th width="25%">Region</th>
67   - <th width="25%">System</th>
68   - <th>Specialty</th>
  64 + <th width="20%">System</th>
  65 + <th width="25%">Specialty</th>
  66 + <th ng-if="islinkActive" width="10%"></th>
  67 +
69 68 </tr>
70 69 </thead>
71 70 <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody">
72 71 <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData">
73   - <td width="25%">
74   - ({{item._id}}) {{item._Title}}
  72 + <td width="20%">
  73 + {{item._Title}}
75 74 </td>
76 75 <td width="25%">
77 76 {{item._BodyRegion}}
78 77 </td>
79   - <td width="25%">
  78 + <td width="20%">
80 79 {{item._BodySystem}}
81 80 </td>
82   - <td>
  81 + <td width="25%">
83 82 {{item._MedicalSpecialty}}
84 83 </td>
  84 + <td ng-if="islinkActive" width="10%">
  85 + <div class="tooltipbtn" style="padding:0px !important">
  86 + <button id="copylistbtn_{{item._id}}" data-clipboard-text="{{item.copyLink}}" onclick="copylistbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>
  87 + <span id="spnlist_{{item._id}}" class="tooltiptext"></span></div>
  88 + </td>
85 89 </tr>
86 90 </tbody>
87 91 <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
88 92 <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData">
89   - <td width="25%">
90   - ({{item._id}}) {{item._Title}}
  93 + <td width="20%">
  94 + {{item._Title}}
91 95 </td>
92 96 <td width="25%">
93 97 {{item._BodyRegion}}
94 98 </td>
95   - <td width="25%">
  99 + <td width="20%">
96 100 {{item._BodySystem}}
97 101 </td>
98   - <td>
  102 + <td width="25%">
99 103 {{item._MedicalSpecialty}}
100 104 </td>
  105 + <td ng-if="islinkActive" width="10%">
  106 + <div class="tooltipbtn" style="padding:0px !important">
  107 + <button id="copylistbtn_{{item._id}}" data-clipboard-text="{{item.copyLink}}" onclick="copylistbtnclick(event)" style="float:right;font-size:11px" >copy embed link</button>
  108 + <span id="spnlist_{{item._id}}" class="tooltiptext"></span></div>
  109 + </td>
101 110 </tr>
102   - <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
103   - <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td>
104   - </tr>-->
105 111 </tbody>
106 112 </table>
107 113 </div>
108   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
109   - <div class="row well" style="margin-bottom: 0px;">
  114 + <div class="col-sm-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
  115 + <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
110 116 <div title="{{SelectedCATitle}}" class="col-sm-3 col-lg-2 no-padding">
111 117 <div class="thumbnail no-margin">
112   - <img id="{{SelectedCAId}}" src="{{SelectedCAthumbImage}}" alt="" title="{{SelectedCATitle}}" data-ng-click="openView($event)" style="height:150px">
  118 + <img id="{{SelectedCAId}}" src="{{SelectedCAthumbImage}}" alt="" title="{{SelectedCATitle}}" data-ng-click="openView($event)" style="height:160px">
113 119 </div>
114 120 </div>
115   - <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
116   - <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
  121 + <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
  122 + <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
117 123 <p ng-bind-html="SelectedCASummary"></p>
118 124 </div>
119   - <button id="{{SelectedCAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
  125 + <button id="{{SelectedCAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)" style="font-size: 14px;">Open</button>
120 126 </div>
121 127  
122 128 </div>
... ... @@ -127,4 +133,38 @@
127 133 </div>
128 134 </div>
129 135 </div>
  136 +<!-- 3. Instantiate clipboard -->
  137 +<style>
  138 + .tooltipbtn {
  139 + position: relative;
  140 + }
  141 +
  142 + .tooltipbtn .tooltiptext {
  143 + visibility: hidden;
  144 + width: 120px;
  145 + background-color: #555;
  146 + color: #fff;
  147 + text-align: center;
  148 + border-radius: 6px;
  149 + padding: 5px 0;
  150 + position: absolute;
  151 + z-index: 1;
  152 + bottom: 125%;
  153 + left: 50%;
  154 + margin-left: -50px;
  155 + opacity: 0;
  156 + transition: opacity 0.3s;
  157 + }
  158 +
  159 + .tooltipbtn .tooltiptext::after {
  160 + content: "";
  161 + position: absolute;
  162 + top: 100%;
  163 + left: 50%;
  164 + margin-left: -5px;
  165 + border-width: 5px;
  166 + border-style: solid;
  167 + border-color: #555 transparent transparent transparent;
  168 + }
  169 + </style>
130 170  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @16f9c60
... ... @@ -131,18 +131,18 @@
131 131 </table>
132 132 </div>
133 133  
134   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
135   - <div class="row well" style="margin-bottom: 0px;">
  134 + <div class="col-sm-12 text-center" ng-show="hiderow" style="padding: 0px 18px 0px 24px;">
  135 + <div class="row well" style="margin-bottom: 0px;padding:4px;height:178px">
136 136 <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding">
137 137 <div class="thumbnail no-margin">
138   - <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)" style="height:150px">
  138 + <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)" style="height:160px">
139 139 </div>
140 140 </div>
141   - <div class="class="col-sm-9 col-lg-9"" style="padding-left:10px;">
142   - <div align="left" style="height:130px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
  141 + <div class="col-sm-9 col-lg-10" style="padding-left:10px;">
  142 + <div align="left" style="height:135px;overflow-y:scroll !important;padding-left: 20px; -webkit-overflow-scrolling:touch !important;">
143 143 <p ng-bind-html="SelectedCISummary"></p>
144 144 </div>
145   - <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
  145 + <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)" style="font-size: 14px;">Open</button>
146 146 </div>
147 147  
148 148 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @16f9c60
... ... @@ -23,7 +23,8 @@
23 23 <div class="clearfix" style=""></div>
24 24 </div>
25 25 <!--Sidebar-->
26   - <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
  26 + <!--with ng-if="!isCAlink" toggle not working-->
  27 + <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide " ng-show="!isCAlink">
27 28 <!--{{name}}-->
28 29 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
29 30 <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="StoreModuleName(module.name);getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"></a></li>
... ... @@ -80,7 +81,6 @@
80 81 var bar = $('.sidebar');
81 82 var main = $('.main');
82 83 $('.toggleBar').click(function () {
83   -
84 84 bar.toggleClass('active');
85 85 main.toggleClass('active');
86 86 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @16f9c60
1 1 <div class="collapse navbar-collapse" id="topMenuBar" style="height:50px !important;margin-left:-15px;width:103%">
2   - <ul class="nav navbar-nav" style="float:left" id="topul1">
  2 + <ul class="nav navbar-nav" style="float:left" id="topul1" ng-if="!isCAlink">
3 3 <li class="dropdown navbarDropdownItem disableFileMenu" id="fileMenuAnchor" style="float:left">
4 4 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
5 5 <ul class="dropdown-menu">
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @16f9c60
... ... @@ -1559,8 +1559,8 @@
1559 1559  
1560 1560  
1561 1561 <!--<script src="libs/jquery/1.11.3/jquery.min.js"></script>-->
1562   - <script src="libs/jquery/2.1.3/jquery.min.js"></script>
1563   - <script src="libs/jquery/1.11.4/jquery-ui.js"></script>
  1562 + <script src="libs/jquery/2.1.3/jquery.min.js"></script>
  1563 + <script src="libs/jquery/1.11.4/jquery-ui.js"></script>
1564 1564 <script src="libs/xml2json.js"></script>
1565 1565  
1566 1566 <script src="libs/jquery/jquery_plugin/jquery.mCustomScrollbar.concat.min.js"></script>
... ... @@ -1573,7 +1573,7 @@
1573 1573 <script src="libs/angular/1.4.9/angular-idle.min.js"></script>
1574 1574 <script src="content/js/custom/custom.js"></script>
1575 1575 <!--Annotation Toolbar : jcanvas Library-->
1576   -
  1576 +
1577 1577 <script src="libs/jcanvas/jcanvas.min.js?v=1.0.0"></script>
1578 1578 <script src="libs/jcanvas/jcanvas.handle.min.js"></script>
1579 1579  
... ... @@ -1634,7 +1634,8 @@
1634 1634 <script src="libs/html2canvas.js?v=1.0.0"></script>
1635 1635 <script src="libs/FileSaverNew.js"></script>
1636 1636 <script src="app/services/LabExerciseService.js?v=1.0.0"></script>
1637   -
  1637 + <script src="libs/clipboard.min.js"></script>
  1638 +
1638 1639 <script>
1639 1640  
1640 1641 $(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/libs/clipboard.min.js 0 → 100644
  View file @16f9c60
  1 +/*!
  2 + * clipboard.js v2.0.8
  3 + * https://clipboardjs.com/
  4 + *
  5 + * Licensed MIT © Zeno Rocha
  6 + */
  7 +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return n={686:function(t,e,n){"use strict";n.d(e,{default:function(){return o}});var e=n(279),i=n.n(e),e=n(370),u=n.n(e),e=n(817),c=n.n(e);function a(t){try{return document.execCommand(t)}catch(t){return}}var f=function(t){t=c()(t);return a("cut"),t};var l=function(t){var e,n,o,r=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body},i="";return"string"==typeof t?(e=t,n="rtl"===document.documentElement.getAttribute("dir"),(o=document.createElement("textarea")).style.fontSize="12pt",o.style.border="0",o.style.padding="0",o.style.margin="0",o.style.position="absolute",o.style[n?"right":"left"]="-9999px",n=window.pageYOffset||document.documentElement.scrollTop,o.style.top="".concat(n,"px"),o.setAttribute("readonly",""),o.value=e,o=o,r.container.appendChild(o),i=c()(o),a("copy"),o.remove()):(i=c()(t),a("copy")),i};function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var s=function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=t.action,n=void 0===e?"copy":e,o=t.container,e=t.target,t=t.text;if("copy"!==n&&"cut"!==n)throw new Error('Invalid "action" value, use either "copy" or "cut"');if(void 0!==e){if(!e||"object"!==r(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===n&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===n&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')}return t?l(t,{container:o}):e?"cut"===n?f(e):l(e,{container:o}):void 0};function d(t){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function y(t,e){return(y=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function h(n){var o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(t){return!1}}();return function(){var t,e=m(n);return t=o?(t=m(this).constructor,Reflect.construct(e,arguments,t)):e.apply(this,arguments),e=this,!(t=t)||"object"!==d(t)&&"function"!=typeof t?function(t){if(void 0!==t)return t;throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}(e):t}}function m(t){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function v(t,e){t="data-clipboard-".concat(t);if(e.hasAttribute(t))return e.getAttribute(t)}var o=function(){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&y(t,e)}(r,i());var t,e,n,o=h(r);function r(t,e){var n;return function(t){if(!(t instanceof r))throw new TypeError("Cannot call a class as a function")}(this),(n=o.call(this)).resolveOptions(e),n.listenClick(t),n}return t=r,n=[{key:"copy",value:function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{container:document.body};return l(t,e)}},{key:"cut",value:function(t){return f(t)}},{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof t?[t]:t,e=!!document.queryCommandSupported;return t.forEach(function(t){e=e&&!!document.queryCommandSupported(t)}),e}}],(e=[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=u()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget,t=s({action:this.action(e),container:this.container,target:this.target(e),text:this.text(e)});this.emit(t?"success":"error",{action:this.action,text:t,trigger:e,clearSelection:function(){e&&e.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}})}},{key:"defaultAction",value:function(t){return v("action",t)}},{key:"defaultTarget",value:function(t){t=v("target",t);if(t)return document.querySelector(t)}},{key:"defaultText",value:function(t){return v("text",t)}},{key:"destroy",value:function(){this.listener.destroy()}}])&&p(t.prototype,e),n&&p(t,n),r}()},828:function(t){var e;"undefined"==typeof Element||Element.prototype.matches||((e=Element.prototype).matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector),t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},438:function(t,e,n){var u=n(828);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=u(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},879:function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var f=n(879),l=n(438);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!f.string(e))throw new TypeError("Second argument must be a String");if(!f.fn(n))throw new TypeError("Third argument must be a Function");if(f.node(t))return c=e,a=n,(u=t).addEventListener(c,a),{destroy:function(){u.removeEventListener(c,a)}};if(f.nodeList(t))return o=t,r=e,i=n,Array.prototype.forEach.call(o,function(t){t.addEventListener(r,i)}),{destroy:function(){Array.prototype.forEach.call(o,function(t){t.removeEventListener(r,i)})}};if(f.string(t))return t=t,e=e,n=n,l(document.body,t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,u,c,a}},817:function(t){t.exports=function(t){var e,n="SELECT"===t.nodeName?(t.focus(),t.value):"INPUT"===t.nodeName||"TEXTAREA"===t.nodeName?((e=t.hasAttribute("readonly"))||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),e||t.removeAttribute("readonly"),t.value):(t.hasAttribute("contenteditable")&&t.focus(),n=window.getSelection(),(e=document.createRange()).selectNodeContents(t),n.removeAllRanges(),n.addRange(e),n.toString());return n}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,u=o.length;i<u;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},r={},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,{a:e}),e},o.d=function(t,e){for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o(686).default;function o(t){if(r[t])return r[t].exports;var e=r[t]={exports:{}};return n[t](e,e.exports,o),e.exports}var n,r});
0 8 \ No newline at end of file
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
  View file @16f9c60
... ... @@ -124,10 +124,11 @@
124 124 <th>Email ID</th>
125 125 <th>User Type</th>
126 126 <th>Created Date</th>
127   - <th>Last Modified Date</th>
  127 + <th>Modified Date</th>
128 128 <th>Account Number</th>
129 129 <th>Product Edition</th>
130   - <th>Status</th>
  130 + <th>User Status</th>
  131 + <th>Lic. Status</th>
131 132 <th>Login Status</th>
132 133 </tr>
133 134 </thead>
... ... @@ -154,7 +155,12 @@
154 155 <span *ngIf="UserEntity.UserStatus!='Active'" class="label label-default">Inactive</span>
155 156 </td>
156 157 <td>
157   - <span *ngIf="UserEntity.LoginStatus==true" class="label label-success">Logged-In (Active Session: {{UserEntity.TotalLogin}})</span>
  158 + <span *ngIf="UserEntity.LicenseStatus=='Active'" class="label label-success">Active</span>
  159 + <span *ngIf="UserEntity.LicenseStatus=='Expired'" class="label label-default">Expired</span>
  160 + <span *ngIf="UserEntity.LicenseStatus=='null'" class="label label-default"></span>
  161 + </td>
  162 + <td style="padding-right: 0px;">
  163 + <span *ngIf="UserEntity.LoginStatus==true" class="label label-success">Logged-In, Active Session: {{UserEntity.TotalLogin}}</span>
158 164 <span *ngIf="UserEntity.LoginStatus==false" class="label label-default">Logged-Out</span>
159 165 </td>
160 166 </tr>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
  View file @16f9c60
... ... @@ -158,21 +158,15 @@ export class UsersList implements OnInit, AfterViewChecked {
158 158 { width: 130, align: 'Center' },
159 159 { width: 120, align: 'Center' },
160 160 { width: 200, align: 'Center' },
161   - { width: 150, align: 'Center' },
162 161 { width: 130, align: 'Center' },
163   - { width: 140, align: 'center' },
164   - { width: 150, align: 'Center' },
165   - { width: 180, align: 'center' },
166   - { width: 100, align: 'center' },
167   - { width: 160, align: 'center' },
  162 + { width: 110, align: 'Center' },
  163 + { width: 120, align: 'center' },
  164 + { width: 140, align: 'Center' },
  165 + { width: 170, align: 'center' },
  166 + { width: 90, align: 'left' },
  167 + { width: 90, align: 'left' },
  168 + { width: 150, align: 'left' },
168 169  
169   - // { width: 80, align: 'center' },
170   - // { width: 150, align: 'center' },
171   - // { width: 150, align: 'center' },
172   - // { width: 180, align: 'Center' },
173   - // { width: 400, align: 'Center' },
174   - // { width: 150, align: 'center' },
175   - // { width: 110, align: 'center' },
176 170 ],
177 171 sort: true
178 172 });
... ...