ADAM / AIAHTML5

Commit d88fb2b47b1966c9f8d890af581302bf36b707a0

Authored by Nikita Kulshreshtha
1 parent e0e10ba3

merged Develop-IPAD-MAC into PreQA

Inline Side-by-side
Showing 12 changed files with 222 additions and 35 deletions
150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetBlockedUserByAccNoAndType.sql 0 → 100644
  View file @d88fb2b
  1 +
  2 +-- =============================================
  3 +-- Author: Magic Software
  4 +-- Create date: 12-May-2009
  5 +-- Description: To get the list of blocked user who have attempt 5 times wrong login
  6 +-- =============================================
  7 +CREATE PROCEDURE [dbo].[GetBlockedUserByAccNoAndType]
  8 + -- Add the parameters for the stored procedure here
  9 + @iUserTypeId tinyint, @iLicenseId int
  10 +AS
  11 +BEGIN
  12 + -- returns the metadata
  13 + IF 1=0 BEGIN
  14 + SET FMTONLY OFF
  15 + END
  16 + SELECT DISTINCT
  17 + AIAUser.Id,
  18 + AIAUser.FirstName,
  19 + AIAUser.LastName,
  20 + AIAUser.LoginId,
  21 + AIAUser.Password,
  22 + AIAUser.EmailId,
  23 + ISNULL(License.AccountNumber,'') AccountNumber,
  24 + IncorrectLoginAttempts.LoginTime
  25 + FROM
  26 + IncorrectLoginAttempts
  27 + INNER JOIN AIAUser ON IncorrectLoginAttempts.UserId = AIAUser.Id
  28 + INNER JOIN UserType ON AIAUser.UserTypeId = UserType.Id
  29 + LEFT JOIN AIAUserToLicenseEdition ON AIAUser.Id = AIAUserToLicenseEdition.UserId
  30 + LEFT JOIN LicenseToEdition ON AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id
  31 + LEFT JOIN License ON LicenseToEdition.LicenseId = License.Id
  32 + WHERE
  33 + IncorrectLoginAttempts.CntIncorrectLogins >= 5
  34 + AND UserType.Priority >= (SELECT UserType.Priority FROM UserType WHERE UserType.Id=@iUserTypeId)
  35 + AND ((@iLicenseId =0) OR (License.Id = @iLicenseId))
  36 + AND License.IsActive = 1
  37 +END
  38 +
  39 +
... ...
150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql
  View file @d88fb2b
1 1 Binary files a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql and b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql differ
... ...
150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_InsertAIAUser.sql 0 → 100644
  View file @d88fb2b
1 1 Binary files /dev/null and b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_InsertAIAUser.sql differ
... ...
150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateAIAUser.sql 0 → 100644
  View file @d88fb2b
1 1 Binary files /dev/null and b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateAIAUser.sql differ
... ...
150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateblockedUser.sql 0 → 100644
  View file @d88fb2b
  1 +
  2 +SET QUOTED_IDENTIFIER ON
  3 +GO
  4 +SET ANSI_NULLS ON
  5 +GO
  6 +
  7 +if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_UpdateblockedUser]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
  8 +drop procedure [dbo].[usp_UpdateblockedUser]
  9 +GO
  10 +
  11 +
  12 +-- =============================================
  13 +-- Author: <Author,,Name>
  14 +-- Create date: <3-Jan-2018>
  15 +-- Description: <Description,,>
  16 +-- =============================================
  17 +CREATE PROCEDURE [dbo].[usp_UpdateblockedUser]--6,'aiaonline1','aiaonline',0
  18 + -- Add the parameters for the stored procedure here
  19 + @Id int,
  20 + @Status int out
  21 +AS
  22 +BEGIN
  23 + -- SET NOCOUNT ON added to prevent extra result sets from
  24 + -- interfering with SELECT statements.
  25 + SET NOCOUNT ON;
  26 +
  27 + BEGIN TRY
  28 +
  29 +
  30 +
  31 + BEGIN TRANSACTION
  32 + DELETE from IncorrectLoginAttempts where UserId =@Id
  33 + set @Status = 1;
  34 + COMMIT TRANSACTION
  35 + --select '1'
  36 +
  37 +
  38 +
  39 + END TRY
  40 + BEGIN CATCH
  41 + IF @@TRANCOUNT > 0
  42 + ROLLBACK TRANSACTION
  43 + END CATCH
  44 +
  45 +END
  46 +
  47 +GO
  48 +SET QUOTED_IDENTIFIER OFF
  49 +GO
  50 +SET ANSI_NULLS ON
  51 +GO
  52 +
  53 +
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @d88fb2b
... ... @@ -497,31 +497,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
497 497  
498 498 //once you get id in scope push detail in jspanel content
499 499  
500   - var openViews;
501   - if ($rootScope.openViews.length > 0) {
502   - openViews = new jinqJs()
503   - .from($rootScope.openViews)
504   - .where("BodyViewId==" + $scope.voId)
505   - .select();
506   - }
  500 + // var openViews;
  501 + //if ($rootScope.openViews.length > 0) {
  502 + // openViews = new jinqJs()
  503 + // .from($rootScope.openViews)
  504 + // .where("BodyViewId==" + $scope.voId)
  505 + // .select();
  506 + //}
507 507 var counter = 1;
508 508 var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
  509 + localStorage.setItem("currentViewTitle", tittle);
  510 + //if (openViews != null && openViews.length > 0) {
  511 + // angular.forEach(openViews, function (value, key) {
509 512  
510   - if (openViews != null && openViews.length > 0) {
511   - angular.forEach(openViews, function (value, key) {
  513 + // if (value.body - views == tittle) {
  514 + // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
  515 + // $rootScope.currentActiveViewTitle = tittle;
  516 + // localStorage.setItem("currentViewTitle", tittle);
  517 + // }
512 518  
513   - if (value.body - views == tittle) {
514   - tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
515   - $rootScope.currentActiveViewTitle = tittle;
516   - localStorage.setItem("currentViewTitle", tittle);
517   - }
518   -
519   - });
520   - }
521   - else {
522   - localStorage.setItem("currentViewTitle", tittle);
  519 + // });
  520 + //}
  521 + //else {
  522 + // localStorage.setItem("currentViewTitle", tittle);
523 523  
524   - }
  524 + //}
525 525  
526 526 //alert($rootScope.getLocalStorageValue("currentViewTitle"));
527 527  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @d88fb2b
... ... @@ -501,7 +501,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
501 501  
502 502  
503 503 $scope.openView = function ($event) {
  504 +<<<<<<< HEAD
504 505  
  506 +=======
  507 +
  508 +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
505 509 $rootScope.MenuModuleName = "CI";
506 510 $rootScope.disableAnnotationTB = false;
507 511 $rootScope.CIAnotationIdentifyModeOff = true;
... ... @@ -523,7 +527,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
523 527  
524 528 }
525 529  
  530 +<<<<<<< HEAD
526 531  
  532 +=======
  533 +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
527 534 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
528 535 localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
529 536  
... ... @@ -539,7 +546,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
539 546  
540 547 $scope.openBodyView = function () {
541 548  
  549 +<<<<<<< HEAD
542 550  
  551 +=======
  552 +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
543 553 if ($rootScope.refreshcheck == null) {
544 554 $location.path('/');
545 555 }
... ... @@ -548,6 +558,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
548 558 $('#spinner').css('visibility', 'visible');
549 559 $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
550 560  
  561 +<<<<<<< HEAD
551 562 // alert($scope.voId);
552 563  
553 564  
... ... @@ -578,6 +589,50 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
578 589 localStorage.setItem("currentViewTitle", tittle);
579 590  
580 591 }
  592 +=======
  593 +
  594 + //once you get id in scope push detail in jspanel content
  595 +
  596 + // var openViews;
  597 + // console.log($rootScope.openViews);
  598 + // if ($rootScope.openViews.length > 0 && $rootScope.openViews != null && $rootScope.openViews != undefined) {
  599 + // alert("entered");
  600 + //for (var i=0; i <= $rootScope.openViews.length - 1; i++) {
  601 + // if ($rootScope.openViews[i].BodyViewId == $scope.voId) {
  602 + // alert("success");
  603 + // openViews = $rootScope.openViews;
  604 + // }
  605 + //}
  606 + // openViews = $rootScope.openViews;
  607 +
  608 +
  609 + //alert($rootScope.openViews);
  610 + //openViews = new jinqJs()
  611 + // .from($rootScope.openViews)
  612 + // .where("BodyViewId==" + $scope.voId)
  613 + // .select();
  614 + //}
  615 +
  616 + var counter = 1;
  617 + var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
  618 + localStorage.setItem("currentViewTitle", tittle);
  619 + //if (openViews != null && openViews.length > 0 && openViews != undefined) {
  620 + // // alert("aaa");
  621 + // console.log(openViews);
  622 + // angular.forEach(openViews, function (value, key) {
  623 + // if (value.body - views == tittle) {
  624 + // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
  625 + // $rootScope.currentActiveViewTitle = tittle;
  626 + // localStorage.setItem("currentViewTitle", tittle);
  627 + // }
  628 +
  629 + // });
  630 + //}
  631 + //else {
  632 + // localStorage.setItem("currentViewTitle", tittle);
  633 +
  634 + //}
  635 +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
581 636  
582 637 //alert($rootScope.getLocalStorageValue("currentViewTitle"));
583 638  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @d88fb2b
... ... @@ -29,22 +29,40 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) {
29 29 for (var i = 0; i < $scope.links.length; i++) {
30 30 if ($scope.links[i].modname == $routeParams.modname) {
31 31 $rootScope.currentActiveModuleTitle = $scope.links[i].title;
32   - if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")
  32 + if ($rootScope.currentActiveModuleTitle == "IP 10" )
33 33 {
34 34 // document.getElementById('externalLink').style.height = "1024px";
35   - if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) {
36   - document.getElementById('externalLink').style.height = 2048 + "px";
37   - }
38   - else {
39   - document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px";
40   - }
  35 + document.getElementById('externalLink').style.height = $(window).outerHeight() - 41 + "px";
41 36  
42 37  
43 38  
44 39 }
45 40 $scope.objdata = $scope.links[i].objurl;
46   - $scope.myObj = $scope.links[i].objstyle;
47   - }
  41 + $scope.myObj = $scope.links[i].objstyle;
  42 + if ($('#externalLink').css('display') === 'none')
  43 + {
  44 + document.getElementById('externalLink').style.display = "block";
  45 + document.getElementById('externalLinkiframe').style.display = "none";
  46 +
  47 + }
  48 +
  49 + if ($rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") {
  50 + if ($uaAOD.match(/(iPod|iPhone|iPad)/i))
  51 + {
  52 + document.getElementById('externalLink').style.display = "none";
  53 + document.getElementById('externalLinkiframe').style.display = "block";
  54 + document.getElementById('externalLinkiframe').style.height = $(window).outerHeight() - 128 + "px";
  55 + document.getElementById("externalLinkiframe").src = $scope.objdata;
  56 +
  57 + }
  58 +
  59 + else {
  60 + document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px";
  61 +
  62 + }
  63 +
  64 + }
  65 + }
48 66 }
49 67 });
50 68  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @d88fb2b
... ... @@ -1292,7 +1292,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1292 1292 });
1293 1293  
1294 1294 $rootScope.loadSearchData = function () {
1295   -
  1295 +
1296 1296 //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
1297 1297 var imageId = $rootScope.imageId;
1298 1298 var promise = ModuleService.getTermTextDataForAAImage(imageId)
... ... @@ -1361,6 +1361,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1361 1361 console.log(' error: ' + error.statusText);
1362 1362 }
1363 1363 )
  1364 +
  1365 +
1364 1366 }
1365 1367  
1366 1368  
... ... @@ -1667,6 +1669,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1667 1669 }
1668 1670 $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1669 1671 $scope.showItemsForSearch = function () {
  1672 +
1670 1673 if($rootScope.isshowAllPinsBtnAfterHideClicked == true){
1671 1674 console.log('showItemsForSearch is called');
1672 1675 //this check is for log only because we are writing length so need to check if its not null or undefined
... ... @@ -1677,6 +1680,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1677 1680  
1678 1681 $scope.IsSearchVisible = true;
1679 1682 document.getElementById("termlistfilter").style.display = "block";
  1683 +
  1684 + $("#backdrop > #searchListDivAA > #termlistfilter > li").each(function (key, value) {
  1685 +
  1686 + if ($(this).find("a").html() == document.getElementById("selectedTermName").value) {
  1687 + $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
  1688 + $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
  1689 + }
  1690 + });
  1691 +
1680 1692 }
1681 1693 else {
1682 1694 $rootScope.loadSearchData();
... ... @@ -1711,6 +1723,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1711 1723 }
1712 1724  
1713 1725 $scope.highlightPinBasedOnSerachItem = function (id) {
  1726 +
1714 1727 $scope.searchItemId = id;
1715 1728 $scope.searchItemText = $("#" + id).text();
1716 1729 $rootScope.searchSelectedText = $("#" + id).text();
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
  View file @d88fb2b
... ... @@ -4,6 +4,12 @@
4 4 <div id="siteloader" class="col-sm-12">
5 5 <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
6 6 <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object>
  7 +<<<<<<< HEAD
  8 +=======
  9 + <iframe style="width:100%;display:none" id="externalLinkiframe" ng-style="myObj" src=""></iframe>
  10 +
  11 +
  12 +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
7 13 </div>
8 14 </div>
9 15 </div>
... ...
400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css
  View file @d88fb2b
... ... @@ -130,12 +130,12 @@
130 130 background: #0095da;
131 131 color: #fff;
132 132 }
133   -#tblDiscountCodes > tbody > tr.active > td {
  133 +#tblDiscountCodes, #fixed_hdr2 > tbody > tr.active > td {
134 134 background: #000;
135 135 color: #FDFBFB;
136 136 }
137 137  
138   -#tblDiscountCodes > tbody > tr.inactive > td {
  138 +#tblDiscountCodes, #fixed_hdr2 > tbody > tr.inactive > td {
139 139 background: #FDFBFB;
140 140 color: #000;
141 141 }
... ...
400-SOURCECODE/Admin/dist/assets/styles/angular-custom.css
  View file @d88fb2b
1   -.form-control[required][disabled] { background: #eeeeee; border-color:#ccc ;}
  1 +.form-control[required][disabled] { background: #eeeeee; border-color:#ccc ;}
2 2 .edisabled span{
3 3 background: #eeeeee;
4 4 border-color: #ccc;
... ... @@ -75,7 +75,7 @@ cursor-pointer {
75 75 }
76 76  
77 77 .alert-header-custom {
78   - background-color: #5d8fc2 !important;
  78 + /* background-color: #5d8fc2 !important; */
79 79 padding: 8px !important;
80 80 color: white;
81 81 }
... ... @@ -102,7 +102,7 @@ cursor-pointer {
102 102 button.alert-closebutton {
103 103 padding: 0;
104 104 cursor: pointer;
105   - background: transparent;
  105 + background: #291b1b00;
106 106 border: 0;
107 107 -webkit-appearance: none;
108 108 }
... ... @@ -297,3 +297,6 @@ ng-select ul li.highlighted span{
297 297 background-color:#2196F3;
298 298 }
299 299  
  300 +
  301 +
  302 +
... ...