ADAM / AIAHTML5

Commit aa3a56dd669f8c57cca42770424c0418657dc108

Authored by Birendra Kumar
2 parents d1d121ae a4479b38

Merge branch 'AIABugFixes' into AIA_Develop

Inline Side-by-side
Showing 3 changed files with 190 additions and 20 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @aa3a56d
... ... @@ -4827,8 +4827,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4827 4827 };
4828 4828 }
4829 4829  
  4830 +
  4831 +
  4832 + $("#termList").find("option").removeClass('currentTermActive');
  4833 + if(actualTermNo>0)
  4834 + {
  4835 + var TermNumber = actualTermNo+'_'+windowviewid;
  4836 + $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
  4837 + }
  4838 +
  4839 +
4830 4840 }
4831   -
  4841 +
4832 4842 }
4833 4843  
4834 4844 }
... ... @@ -11153,6 +11163,25 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11153 11163 }, 200);
11154 11164 }
11155 11165  
  11166 +
  11167 + $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  11168 + var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
  11169 +
  11170 + if (actualTermNumber >0) {
  11171 +
  11172 + var pinData = new jinqJs()
  11173 + .from( $scope.limitTofilterdata)
  11174 + .where("_ActualTermNumber == " + actualTermNumber)
  11175 + .select();
  11176 +
  11177 + if(pinData.length>0)
  11178 + {
  11179 + var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
  11180 + $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  11181 + }
  11182 +
  11183 + }
  11184 +
11156 11185 }
11157 11186  
11158 11187 $scope.HideSearch = function () {
... ... @@ -11361,6 +11390,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11361 11390 $('#btlLoadMoreLm').attr('disabled', 'disabled');
11362 11391 }
11363 11392  
  11393 + var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
  11394 + $("#termList").find("option").removeClass('currentTermActive');
  11395 + if(actualTermNo>0)
  11396 + {
  11397 + var TermNumber = actualTermNo+'_'+windowviewid;
  11398 + $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
  11399 + }
  11400 +
11364 11401 $scope.EnableDAUI(windowviewid);
11365 11402  
11366 11403 }
... ... @@ -11496,6 +11533,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11496 11533 }
11497 11534  
11498 11535 }
  11536 +
  11537 + var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
  11538 + $("#termList").find("option").removeClass('currentTermActive');
  11539 + if(actualTermNo>0)
  11540 + {
  11541 + var TermNumber = actualTermNo+'_'+windowviewid;
  11542 + $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
  11543 + }
  11544 +
11499 11545 $scope.EnableDAUI(windowviewid);
11500 11546  
11501 11547 }
... ... @@ -11537,10 +11583,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11537 11583 $scope.SetwindowStoreData(windowviewid,'isNormalMode',false);
11538 11584 $scope.SetwindowStoreData(windowviewid,'prevId',actualTermNumber);
11539 11585  
11540   - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
11541   - $("#termList").find("option[id=" + selectedtermid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  11586 +
  11587 + $("#termList").find("option").removeClass('currentTermActive');
  11588 +
  11589 + $("#termList").find("option[id=" + selectedtermid + "]").addClass('currentTermActive');
  11590 +
11542 11591  
11543   - var isListManagerSelected=true;
  11592 + var isListManagerSelected=true;
11544 11593 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',isListManagerSelected);
11545 11594 //---
11546 11595 if (isListManagerSelected == true) {
... ... @@ -12005,6 +12054,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
12005 12054 $compile($all)($scope);
12006 12055  
12007 12056 $("#typedTermName_" + windowviewid).attr("name", "0");
  12057 +
  12058 +
  12059 + $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  12060 +
  12061 + var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
  12062 +
  12063 + if (actualTermNumber >0) {
  12064 +
  12065 + var pinData = new jinqJs()
  12066 + .from( $scope.limitTofilterdata)
  12067 + .where("_ActualTermNumber == " + actualTermNumber)
  12068 + .select();
  12069 +
  12070 +
  12071 + if(pinData.length>0)
  12072 + {
  12073 + var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
  12074 + $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  12075 + }
  12076 +
  12077 + }
12008 12078  
12009 12079 };
12010 12080  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @aa3a56d
... ... @@ -2841,6 +2841,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2841 2841 }
2842 2842  
2843 2843  
  2844 + // highlight pin on list manager
  2845 +
  2846 + $("#termList").find("option").removeClass('currentTermActive');
  2847 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  2848 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  2849 +
  2850 + if (activePinArray.length >0) {
  2851 + for (var i = 0; i < activePinArray.length; i++) {
  2852 + var pinnum = activePinArray[i].split("_")[1];
  2853 +
  2854 + var pinData = new jinqJs()
  2855 + .from(aaPinData)
  2856 + .where("_PinId == " + pinnum)
  2857 + .select();
  2858 +
  2859 + var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
  2860 + $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  2861 + }
  2862 + }
2844 2863 }
2845 2864  
2846 2865  
... ... @@ -3180,6 +3199,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3180 3199 $('#btlLoadMoreLm').attr('disabled', 'disabled');
3181 3200 }
3182 3201  
  3202 + $("#termList").find("option").removeClass('currentTermActive');
  3203 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  3204 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  3205 +
  3206 + if (activePinArray.length >0) {
  3207 + for (var i = 0; i < activePinArray.length; i++) {
  3208 + var pinnum = activePinArray[i].split("_")[1];
  3209 +
  3210 + var pinData = new jinqJs()
  3211 + .from(aaPinData)
  3212 + .where("_PinId == " + pinnum)
  3213 + .select();
  3214 +
  3215 + var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
  3216 + $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  3217 + }
  3218 + }
  3219 +
3183 3220 $scope.EnableAAUI(windowviewid);
3184 3221  
3185 3222 }
... ... @@ -3300,6 +3337,23 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3300 3337 $('#btlLoadMoreLm').attr('disabled', 'disabled');
3301 3338 }
3302 3339  
  3340 + $("#termList").find("option").removeClass('currentTermActive');
  3341 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  3342 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  3343 +
  3344 + if (activePinArray.length >0) {
  3345 + for (var i = 0; i < activePinArray.length; i++) {
  3346 + var pinnum = activePinArray[i].split("_")[1];
  3347 +
  3348 + var pinData = new jinqJs()
  3349 + .from(aaPinData)
  3350 + .where("_PinId == " + pinnum)
  3351 + .select();
  3352 +
  3353 + var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
  3354 + $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  3355 + }
  3356 + }
3303 3357 }
3304 3358 $scope.EnableAAUI(windowviewid);
3305 3359  
... ... @@ -3574,9 +3628,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3574 3628  
3575 3629 $('#termlistfilter_'+windowviewid).css("display", "block");
3576 3630  
  3631 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  3632 +
3577 3633 angular.forEach($scope.limitTofilterdata, function (value2, key2) {
3578   - var $el = $('<option id=' + value2._TermNumber +'_' +windowviewid+ '>' + value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
  3634 +
  3635 + var $el = $('<option id=' + value2._TermNumber +'_' +windowviewid+'>' + value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
3579 3636 $compile($el)($scope);
  3637 +
3580 3638 })
3581 3639  
3582 3640 var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
... ... @@ -3587,8 +3645,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3587 3645 $timeout(function () {
3588 3646 $('#termlistfilter_'+windowviewid).focus();
3589 3647 }, 200);
3590   - }
3591   -
  3648 + }
  3649 +
  3650 + $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  3651 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  3652 +
  3653 + if (activePinArray.length >0) {
  3654 + for (var i = 0; i < activePinArray.length; i++) {
  3655 + var pinnum = activePinArray[i].split("_")[1];
  3656 +
  3657 + var pinData = new jinqJs()
  3658 + .from(aaPinData)
  3659 + .where("_PinId == " + pinnum)
  3660 + .select();
  3661 +
  3662 + var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
  3663 + $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  3664 + }
  3665 + }
  3666 +
  3667 +
3592 3668 }
3593 3669  
3594 3670 $scope.resetSearchListView = function (event) {
... ... @@ -3673,6 +3749,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3673 3749 $compile($all)($scope);
3674 3750  
3675 3751 $("#selectedTermName_" + windowviewid).attr("name", "0");
  3752 +
  3753 + $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  3754 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  3755 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  3756 +
  3757 + if (activePinArray.length >0) {
  3758 + for (var i = 0; i < activePinArray.length; i++) {
  3759 + var pinnum = activePinArray[i].split("_")[1];
  3760 +
  3761 + var pinData = new jinqJs()
  3762 + .from(aaPinData)
  3763 + .where("_PinId == " + pinnum)
  3764 + .select();
  3765 +
  3766 + var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
  3767 + $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
  3768 + }
  3769 + }
3676 3770  
3677 3771 };
3678 3772  
... ... @@ -3774,9 +3868,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3774 3868  
3775 3869 $scope.showAllPinsAfterHide(windowviewid);
3776 3870  
3777   - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
3778   - $("#termList").find("option[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
3779   -
  3871 + // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  3872 + $("#termList").find("option").removeClass('currentTermActive');
  3873 + $("#termList").find("option[id=" + termid + "]").addClass('currentTermActive');
  3874 +
3780 3875 //get data from pindata for this trem
3781 3876  
3782 3877 var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @aa3a56d
... ... @@ -1538,17 +1538,10 @@ footer .browserIcons
1538 1538 bottom: 0;
1539 1539 width: 50%;
1540 1540 }
1541   -.labExModalbackground
  1541 +.currentTermActive
1542 1542 {
1543   - background-color: black;
1544   - bottom: 0px;
1545   - display: none;
1546   - height: 100%; left: 0px;
1547   - opacity: 0.5;
1548   - position: fixed;
1549   - right: 0px; top: 0px;
1550   - width: 100%;
1551   - z-index: 12000000;
  1543 + background-color: #206db9 !important;
  1544 + color:#ffffff !important;
1552 1545 }
1553 1546 #nameHelpBlock
1554 1547 {
... ... @@ -1562,6 +1555,18 @@ footer .browserIcons
1562 1555 {
1563 1556 display:none;
1564 1557 }
  1558 +.labExModalbackground
  1559 +{
  1560 + background-color: black;
  1561 + bottom: 0px;
  1562 + display: none;
  1563 + height: 100%; left: 0px;
  1564 + opacity: 0.5;
  1565 + position: fixed;
  1566 + right: 0px; top: 0px;
  1567 + width: 100%;
  1568 + z-index: 12000000;
  1569 +}
1565 1570 /* ........Add paging bootstrap CSS... Birendra 14/2/2020 */
1566 1571 .pagination{margin:0px 0;}
1567 1572 .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
... ...