Commit 43208f422d0c241d87e522407b99a0957fe8f1dc

Authored by Birendra
1 parent 3705d19f

AA and DA tool fixed , update extra scrolling and top menu in admin

Showing 45 changed files with 1842 additions and 481 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... ... @@ -1184,7 +1184,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1184 1184 var bodySystemListObj = document.getElementById("structureDropdownDA_" + windowviewid);
1185 1185 var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0;
1186 1186 if (len>1) {
1187   - $scope.stopIntervalLoader(timeintval);
  1187 + $scope.stopIntervalLoader(timeintval);
  1188 + // set search for language input
  1189 + $scope.langSearchLoad(windowviewid);
1188 1190 //wait until DOM element load of DA
1189 1191 $scope.daViewLoader(windowviewid);
1190 1192 }
... ... @@ -1377,8 +1379,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1377 1379 }
1378 1380 });
1379 1381  
1380   - // set search for language input
1381   - $scope.langSearchLoad(windowviewid);
1382 1382  
1383 1383 }
1384 1384  
... ... @@ -1388,18 +1388,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1388 1388 $('#searchlangaugeDiv_'+windowviewid).css("display","none");
1389 1389 var languageArray = $rootScope.lexiconLanguageArray;
1390 1390  
1391   - $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "10px");
  1391 + // $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "10px");
1392 1392  
1393 1393 if(languageArray.length>1)
1394 1394 {
1395   - $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "-10px");
  1395 + // $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "-10px");
1396 1396 $('#searchlangaugeDiv_'+windowviewid).css("display","block");
1397 1397 var option='';
1398 1398 for (var i = 0; i <= languageArray.length - 1; i++) {
1399 1399 option=option+'<option value="' + languageArray[i].id + '">' + languageArray[i].language + '</option>';
1400 1400 }
1401 1401 var $all = $('#searchlangaugeDiv_'+windowviewid).append(
1402   - '<div class="btn-group col-sm-3 col-xs-3 col-md-2" style="margin-right:-10px">'+
  1402 + '<div class="btn-group col-sm-3 col-xs-3 col-md-2" style="margin-right:-10px;padding-left:0px">'+
1403 1403 '<select class="form-control" id="searchLanguageLm_'+windowviewid+'" ng-blur="HideSearch()" onchange="changeSearchLanguage(event)" style="height:30px;padding:4px 12px">'+
1404 1404 option+
1405 1405 '</select>'+
... ... @@ -9622,14 +9622,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9622 9622  
9623 9623 //set true to false or vice versa
9624 9624 var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');
9625   -
  9625 + $("#multiannotation_" + windowviewid).toggleClass("disableMultiAnnotationText");
  9626 +
9626 9627 if(iskeyctrlActive)
9627 9628 {
9628   - $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText");
  9629 + $("#multiannotation_"+windowviewid ).attr('title', 'Active Multiple Structure');
9629 9630 }
9630 9631 else
9631 9632 {
9632   - $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText");
  9633 + $("#multiannotation_"+windowviewid ).attr('title', 'Disable Multiple Structure');
9633 9634 }
9634 9635  
9635 9636 $scope.SetwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive);
... ... @@ -9642,19 +9643,23 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9642 9643 var windowviewid = (event.currentTarget.id).split("_")[len-1];
9643 9644  
9644 9645 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
  9646 + $("#btnStrutureBox_" + windowviewid).toggleClass("disableHideShowStructure");
9645 9647 $rootScope.CloseListManager();
9646 9648 var btnStrutureBoxname = document.getElementById("btnStrutureBox_" + windowviewid).name;
9647 9649  
9648 9650 if (btnStrutureBoxname == "showAnnotationStructure") {
9649   - $("#btnStrutureBox_" + windowviewid).addClass("disableHideShowStructure");
  9651 + $("#btnStrutureBox_"+windowviewid ).attr('title', 'Show Structure Name Boxes');
  9652 + $("#btnStrutureBox_"+windowviewid +" i").removeClass("far fa-comment-alt-times").addClass("far fa-comment-alt");
  9653 + $("#btnStrutureBox_"+windowviewid ).attr('name', 'hideAnnotationStructure');
  9654 +
9650 9655 $scope.hideAnnotation(windowviewid);
9651   - document.getElementById("btnStrutureBox_" + windowviewid).name = "hideAnnotationStructure";
9652 9656 $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationStructure');
9653 9657 }
9654 9658 else {
9655   - $("#btnStrutureBox_" + windowviewid).removeClass("disableHideShowStructure");
  9659 + $("#btnStrutureBox_"+windowviewid ).attr('title', 'Hide Structure Name Boxes');
  9660 + $("#btnStrutureBox_"+windowviewid +" i").removeClass("far fa-comment-alt").addClass("far fa-comment-alt-times");
  9661 + $("#btnStrutureBox_"+windowviewid ).attr('name', 'showAnnotationStructure');
9656 9662 $scope.showAnnotation(windowviewid);
9657   - document.getElementById("btnStrutureBox_" + windowviewid).name = "showAnnotationStructure";
9658 9663 $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationStructure');
9659 9664 }
9660 9665 }
... ... @@ -11940,7 +11945,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11940 11945  
11941 11946 var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue');
11942 11947  
11943   - if ((newtimestamp - oldtimestamp) > 500) {
  11948 + if ((newtimestamp - oldtimestamp) > 100) {
11944 11949  
11945 11950 $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
11946 11951 $scope.showFilteredTerms(windowviewid);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... ... @@ -787,10 +787,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
787 787 $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
788 788  
789 789 $timeout(function () {
  790 + $scope.setControlsIDs(windowviewid);
790 791 if (document.getElementById('aaBodyView') != null) {
791 792 $compile(aaViewElement.contents())($scope);
792   - $scope.setControlsIDs(windowviewid);
793   -
  793 +
794 794 var timeintval = null;
795 795 timeintval = $interval(function () {
796 796 var bodySystemListObj = document.getElementById("bodySystemList_" + windowviewid);
... ... @@ -798,6 +798,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
798 798 if (len>1) {
799 799 $scope.stopIntervalLoader();
800 800 //wait until DOM element load of AA
  801 + // set search for language input
  802 + $scope.langSearchLoad(windowviewid);
801 803 $scope.loadAAModule(windowviewid);
802 804 }
803 805 else
... ... @@ -805,7 +807,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
805 807 $scope.setControlsIDs(windowviewid);
806 808 console.log("waiting for loading module");
807 809 }
808   - }, 200);
  810 + },100);
809 811 $scope.stopIntervalLoader = function () {
810 812 if (angular.isDefined(timeintval)) {
811 813 $interval.cancel(timeintval);
... ... @@ -815,7 +817,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
815 817  
816 818 }
817 819  
818   - }, 500);
  820 + }, 1000);
819 821  
820 822 }
821 823  
... ... @@ -1119,9 +1121,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1119 1121 }
1120 1122 }
1121 1123 });
1122   -
1123   - // set search for language input
1124   - $scope.langSearchLoad(windowviewid);
1125 1124  
1126 1125 }
1127 1126  
... ... @@ -1142,7 +1141,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1142 1141 option=option+'<option value="' + languageArray[i].id + '">' + languageArray[i].language + '</option>';
1143 1142 }
1144 1143 var $all = $('#searchlangaugeDiv_'+windowviewid).append(
1145   - '<div class="btn-group col-sm-3 col-xs-3 col-md-2" style="margin-right:-10px">'+
  1144 + '<div class="btn-group col-sm-3 col-xs-3 col-md-2" style="margin-right:-10px;padding-left:0px;">'+
1146 1145 '<select class="form-control" id="searchLanguageLm_'+windowviewid+'" onblur="hideSearchList(event)" onchange="changeaaSearchLanguage(event)" style="height:30px;padding:4px 12px">'+
1147 1146 option+
1148 1147 '</select>'+
... ... @@ -3603,7 +3602,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3603 3602  
3604 3603 var oldtimestamp = $scope.GetAAwindowStoreData(windowviewid, 'SearchTimeStampValue');
3605 3604  
3606   - if ((newtimestamp - oldtimestamp) > 500) {
  3605 + if ((newtimestamp - oldtimestamp) > 100) {
3607 3606  
3608 3607 $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
3609 3608 $scope.showFilteredTerms(windowviewid);
... ... @@ -3829,15 +3828,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3829 3828  
3830 3829 //set true to false or vice versa
3831 3830 var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl');
3832   -
3833   - if(iskeyctrlActive)
3834   - {
3835   - $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText");
3836   - }
3837   - else
3838   - {
3839   - $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText");
3840   - }
  3831 +
  3832 + $("#multiannotation_" + windowviewid).toggleClass("disableAAMultiAnnotationText");
  3833 +
  3834 + if(iskeyctrlActive)
  3835 + {
  3836 + $("#multiannotation_"+windowviewid ).attr('title', 'Active Multiple Structure');
  3837 + }
  3838 + else
  3839 + {
  3840 + $("#multiannotation_"+windowviewid ).attr('title', 'Disable Multiple Structure');
  3841 + }
3841 3842  
3842 3843 $scope.SetAAwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive);
3843 3844 }
... ... @@ -3848,17 +3849,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3848 3849 $rootScope.UnsaveCurriculum = true;
3849 3850  
3850 3851 var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name;
  3852 + $("#comment-box_" + windowviewid).toggleClass("disableAAAnnotationText");
3851 3853  
3852 3854 if (btnStrutureBoxname == "showAnnotationText") {
3853   - $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
3854   - document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText";
3855   - $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText');
  3855 + $("#comment-box_"+windowviewid ).attr('title', 'Show Structure Name Boxes');
  3856 + $("#comment-box_"+windowviewid +" i").removeClass("far fa-comment-alt-times").addClass("far fa-comment-alt");
  3857 + $("#comment-box_"+windowviewid ).attr('name', 'hideAnnotationText');
  3858 + $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText');
3856 3859 }
3857 3860 else
3858 3861 {
3859   - $("#comment-box_"+windowviewid).removeClass("disableAnnotationText");
3860   - document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText";
  3862 + $("#comment-box_"+windowviewid ).attr('title', 'Hide Structure Name Boxes');
  3863 + $("#comment-box_"+windowviewid +" i").removeClass("far fa-comment-alt").addClass("far fa-comment-alt-times");
  3864 + $("#comment-box_"+windowviewid ).attr('name', 'showAnnotationText');
3861 3865 $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationText');
  3866 +
3862 3867 }
3863 3868  
3864 3869 $scope.ShowHideAnnotationText(windowviewid);
... ... @@ -3876,7 +3881,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3876 3881 }
3877 3882 }
3878 3883 else {
3879   - $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
  3884 + $("#comment-box_"+windowviewid).addClass("disableAAAnnotationText");
3880 3885  
3881 3886 for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) {
3882 3887 $("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "none");
... ... @@ -4097,6 +4102,14 @@ function hideSearchList(event) {
4097 4102 });
4098 4103 }
4099 4104  
  4105 +function resetSearchListView(event) {
  4106 + console.log('AA keyup search is called')
  4107 + var scope = angular.element(document.getElementById("aaBodyView")).scope();
  4108 + scope.$apply(function () {
  4109 + scope.resetSearchListView(event);
  4110 + });
  4111 +}
  4112 +
4100 4113 function onSearchItemSelection(termid, isTermListOptionClicked) {
4101 4114  
4102 4115 console.log('AA hide search is called');
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
... ... @@ -58,15 +58,7 @@
58 58 .pad0 {
59 59 padding: 0;
60 60 }
61   - .disableAnnotationText {
62   - background: #4b4b4b;
63   - border-color: #3f3f3f !important;
64   - }
65   - .disableMultiAnnotationText {
66   - background: #4b4b4b;
67   - border-color: #3f3f3f !important;
68   - }
69   -
  61 +
70 62  
71 63 </style>
72 64 <div id="aaDetailPageDiv" class="ng-scope" ng-controller="TileViewListController">
... ... @@ -96,13 +88,18 @@
96 88 <li class="disabledSelectedSystem"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
97 89 </ul>
98 90 </div>
99   - <div class="col-sm-12" style="float:left" >
100   - <button onclick="showHideAnnotation(event)" class="btn btn-primary btn-sm marginTop5 tooltip-custom btn-block" data-toggle="tooltip" id="comment-box" name="showAnnotationText" style="background-position: 28px -73px;width:80px;" title="Show/Hide Structure Name Boxes"></button>
101   - </div>
102   - <div class="col-sm-12" style="float:left" title="Active Multiple Annotations">
103   - <button onclick="keyControlAAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableMultiAnnotationText" data-toggle="tooltip" id="multiannotation" style="background-position: 0px 40px;width:80px;" title="Active Multiple Annotations">
104   - <img src="content/images/mult-annotation.png" alt="" style="height:26px;margin-top:-2px"></button>
105   - </div>
  91 +
  92 + </div>
  93 + <div class="col-sm-12" style="float:left" >
  94 + <button onclick="showHideAnnotation(event)" class="btn btn-primary btn-sm marginTop5 tooltip-custom btn-block" data-toggle="tooltip" id="comment-box" name="showAnnotationText" title="Hide Structure Name Boxes">
  95 + <i class="far fa-comment-alt-times" style="font-size:20px;"></i>
  96 + </button>
  97 + </div>
  98 + <div class="col-sm-12" style="float:left">
  99 + <button onclick="keyControlAAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableAAMultiAnnotationText" data-toggle="tooltip" id="multiannotation" title="Active Multiple Structure">
  100 + <!-- <img src="content/images/mult-annotation.png" alt="" style="height:26px;margin-top:-2px"> -->
  101 + <i class="far fa-comments" style="font-size:20px;"></i>
  102 + </button>
106 103 </div>
107 104 <div class="pips-slider" style="margin-top:155px">
108 105 <h3>Zoom <i class="fa fa-search-plus"></i></h3>
... ... @@ -114,8 +111,9 @@
114 111 <div class="stickey-area" id="aastickeyarea" style="margin-left:7px;height:44px">
115 112 <div class="breadcrumb">
116 113 <div class="">
  114 + <div id="searchlangaugeDiv"></div>
117 115 <div class="input-group col-sm-6 col-xs-7 col-md-7 pull-left"">
118   - <input type="text" class="form-control input-sm pull-left" id="selectedTermName" onclick="onSearchAA(event)" ondblclick="onSearchAA(event)" ng-keyup="resetSearchListView($event)" onblur="hideSearchList(event)" ng-model="searchFilter" placeholder=" search..." autocomplete="off">
  116 + <input type="text" class="form-control input-sm pull-left" id="selectedTermName" onclick="onSearchAA(event)" ondblclick="onSearchAA(event)" onkeyup="resetSearchListView(event)" onblur="hideSearchList(event)" ng-model="searchFilter" placeholder=" search..." autocomplete="off">
119 117  
120 118 <div id="backdrop">
121 119 <div id="searchListDivAA" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
... ... @@ -131,9 +129,7 @@
131 129 <i class="fa fa-caret-down" style="font-size:20px;"></i>
132 130 </button>
133 131 </div>
134   - <div id="searchlangaugeDiv">
135   -
136   - </div>
  132 +
137 133 <div class="btn-group open" id="da-body-nav" style="float: right; margin-left: 2px;right: 100px;">
138 134 <button id="navigatorBtn" type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none; right: -80px;" class="btn btn-primary dropdown-toggle btn-sm">
139 135 <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
... ... @@ -121,11 +121,6 @@
121 121 left: 0;
122 122 right: 0;
123 123 }
124   -
125   - .disableMultiAnnotationText {
126   - background: #4b4b4b;
127   - border-color: #3f3f3f !important;
128   - }
129 124 </style>
130 125 <div class=" " id="daView" ng-controller="DAController">
131 126 <div class="pos-relative leftToolBar tools pull-left">
... ... @@ -217,11 +212,16 @@
217 212 </div>
218 213  
219 214 <div class="col-xs-12">
220   - <button id="btnStrutureBox" onclick="enableShowHideStructureBox(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
  215 + <button id="btnStrutureBox" onclick="enableShowHideStructureBox(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Hide Structure Name Boxes">
  216 + <i class="far fa-comment-alt-times" style="font-size:20px;"></i>
  217 + </button>
221 218 </div>
222 219  
223   - <div class="col-xs-12" title="Active Multiple Annotations">
224   - <button id="multiannotation" onclick="keyControlDAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableMultiAnnotationText" data-toggle="tooltip" data-placement="bottom" title="Active Multiple Annotations" style="height:30px"><img src="content/images/mult-annotation.png" alt="" style="height:23px;margin-top:-1px"></button>
  220 + <div class="col-xs-12">
  221 + <button id="multiannotation" onclick="keyControlDAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableMultiAnnotationText" data-toggle="tooltip" data-placement="bottom" title="Active Multiple Structure" >
  222 + <!-- <img src="content/images/mult-annotation.png" alt="" style="height:23px;margin-top:-1px"> -->
  223 + <i class="far fa-comments" style="font-size:20px;"></i>
  224 + </button>
225 225 </div>
226 226  
227 227 </div>
... ... @@ -243,6 +243,7 @@
243 243 <div class="stickey-area" id="dastickeyarea" style="margin-left:7px;height:44px">
244 244 <div class="breadcrumb " style="margin-bottom:0px">
245 245 <div class="">
  246 + <div id="searchlangaugeDiv"></div>
246 247 <div class="input-group col-sm-6 col-xs-7 col-md-7 pull-left" id="da-input">
247 248  
248 249 <div id="backdrop">
... ... @@ -253,17 +254,14 @@
253 254 </div>
254 255  
255 256 </div>
256   - <div class="btn-group" style="vertical-align:top; float:left;margin-right: -10px;">
  257 + <div class="btn-group" style="vertical-align:top; float:left;margin-right: 5px;">
257 258  
258 259 <button type="button" id="btnDATermSearch" style="padding: 5px 10px 4px 10px !important;border: none;" class="btn btn-success btn-sm" onclick="OnSearch(event)">
259 260 <!--<img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">-->
260 261 <i class="fa fa-caret-down" style="font-size:20px;"></i>
261 262 </button>
262   - </div>
263   - <div id="searchlangaugeDiv">
264   -
265   - </div>
266   - <div class="btn-group" style="vertical-align:top;margin-right: 10px;">
  263 + </div>
  264 + <div class="btn-group" style="vertical-align:top;">
267 265 <!-- <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>-->
268 266 <button type="button" id="btnSearchList" class="btn btn-primary btn-sm col-xs-12" onclick="ApplySearch(event)" style="margin-right:2px;">
269 267 <!-- <i class="fa fa-search"></i>-->
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
... ... @@ -23,6 +23,7 @@
23 23  
24 24 <link href="themes/default/css/bootstrap/3.3.6/secondeffect.css" rel="stylesheet" />
25 25  
  26 + <link href="https://kit-pro.fontawesome.com/releases/v5.15.4/css/pro.min.css" rel="stylesheet">
26 27 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
27 28 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic">
28 29  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... ... @@ -1035,11 +1035,50 @@ background-size:cover;
1035 1035 background-color: lightgrey;
1036 1036 }
1037 1037  
1038   - .disableHideShowStructure
1039   - {
1040   - background:#4b4b4b !important;
1041   - border-color:#3f3f3f !important;
1042   - }
  1038 +.disableAAAnnotationText {
  1039 + background:#4b4b4b !important;
  1040 + border-color:#3f3f3f !important;
  1041 + }
  1042 +.disableAAAnnotationText:hover {
  1043 + color: #ffffff;
  1044 + background-color: #0072a7 !important;
  1045 + border-color: #005076 !important;
  1046 + }
  1047 +
  1048 +.disableAAMultiAnnotationText
  1049 + {
  1050 + background:#4b4b4b !important;
  1051 + border-color:#3f3f3f !important;
  1052 + }
  1053 +.disableAAMultiAnnotationText:hover {
  1054 + color: #ffffff;
  1055 + background-color: #0072a7 !important;
  1056 + border-color: #005076 !important;
  1057 + }
  1058 +
  1059 +.disableHideShowStructure
  1060 + {
  1061 + background:#4b4b4b !important;
  1062 + border-color:#3f3f3f !important;
  1063 + }
  1064 +.disableHideShowStructure:hover {
  1065 + color: #ffffff;
  1066 + background-color: #0072a7 !important;
  1067 + border-color: #005076 !important;
  1068 + }
  1069 +
  1070 +.disableMultiAnnotationText
  1071 + {
  1072 + background:#4b4b4b !important;
  1073 + border-color:#3f3f3f !important;
  1074 + }
  1075 +
  1076 +.disableMultiAnnotationText:hover {
  1077 + color: #ffffff;
  1078 + background-color: #0072a7 !important;
  1079 + border-color: #005076 !important;
  1080 + }
  1081 +
1043 1082 .btn-annotation-erase:hover
1044 1083 {
1045 1084 color: #fff;
... ...
400-SOURCECODE/Admin/package-lock.json
... ... @@ -122,6 +122,19 @@
122 122 "zone.js": "^0.8.14"
123 123 },
124 124 "dependencies": {
  125 + "ajv": {
  126 + "version": "6.12.6",
  127 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
  128 + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
  129 + "dev": true,
  130 + "optional": true,
  131 + "requires": {
  132 + "fast-deep-equal": "^3.1.1",
  133 + "fast-json-stable-stringify": "^2.0.0",
  134 + "json-schema-traverse": "^0.4.1",
  135 + "uri-js": "^4.2.2"
  136 + }
  137 + },
125 138 "ansi-styles": {
126 139 "version": "3.2.1",
127 140 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
... ... @@ -131,6 +144,20 @@
131 144 "color-convert": "^1.9.0"
132 145 }
133 146 },
  147 + "assert-plus": {
  148 + "version": "1.0.0",
  149 + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
  150 + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
  151 + "dev": true,
  152 + "optional": true
  153 + },
  154 + "aws-sign2": {
  155 + "version": "0.7.0",
  156 + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
  157 + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
  158 + "dev": true,
  159 + "optional": true
  160 + },
134 161 "chalk": {
135 162 "version": "2.4.2",
136 163 "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
... ... @@ -142,12 +169,175 @@
142 169 "supports-color": "^5.3.0"
143 170 }
144 171 },
  172 + "cross-spawn": {
  173 + "version": "3.0.1",
  174 + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
  175 + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
  176 + "dev": true,
  177 + "optional": true,
  178 + "requires": {
  179 + "lru-cache": "^4.0.1",
  180 + "which": "^1.2.9"
  181 + }
  182 + },
  183 + "fast-deep-equal": {
  184 + "version": "3.1.3",
  185 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
  186 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
  187 + "dev": true,
  188 + "optional": true
  189 + },
  190 + "form-data": {
  191 + "version": "2.3.3",
  192 + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
  193 + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
  194 + "dev": true,
  195 + "optional": true,
  196 + "requires": {
  197 + "asynckit": "^0.4.0",
  198 + "combined-stream": "^1.0.6",
  199 + "mime-types": "^2.1.12"
  200 + }
  201 + },
  202 + "har-schema": {
  203 + "version": "2.0.0",
  204 + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
  205 + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
  206 + "dev": true,
  207 + "optional": true
  208 + },
  209 + "har-validator": {
  210 + "version": "5.1.5",
  211 + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
  212 + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
  213 + "dev": true,
  214 + "optional": true,
  215 + "requires": {
  216 + "ajv": "^6.12.3",
  217 + "har-schema": "^2.0.0"
  218 + }
  219 + },
145 220 "has-flag": {
146 221 "version": "3.0.0",
147 222 "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
148 223 "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
149 224 "dev": true
150 225 },
  226 + "http-signature": {
  227 + "version": "1.2.0",
  228 + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
  229 + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
  230 + "dev": true,
  231 + "optional": true,
  232 + "requires": {
  233 + "assert-plus": "^1.0.0",
  234 + "jsprim": "^1.2.2",
  235 + "sshpk": "^1.7.0"
  236 + }
  237 + },
  238 + "json-schema-traverse": {
  239 + "version": "0.4.1",
  240 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
  241 + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
  242 + "dev": true,
  243 + "optional": true
  244 + },
  245 + "node-gyp": {
  246 + "version": "3.8.0",
  247 + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
  248 + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
  249 + "dev": true,
  250 + "optional": true,
  251 + "requires": {
  252 + "fstream": "^1.0.0",
  253 + "glob": "^7.0.3",
  254 + "graceful-fs": "^4.1.2",
  255 + "mkdirp": "^0.5.0",
  256 + "nopt": "2 || 3",
  257 + "npmlog": "0 || 1 || 2 || 3 || 4",
  258 + "osenv": "0",
  259 + "request": "^2.87.0",
  260 + "rimraf": "2",
  261 + "semver": "~5.3.0",
  262 + "tar": "^2.0.0",
  263 + "which": "1"
  264 + },
  265 + "dependencies": {
  266 + "nopt": {
  267 + "version": "3.0.6",
  268 + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
  269 + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
  270 + "dev": true,
  271 + "optional": true,
  272 + "requires": {
  273 + "abbrev": "1"
  274 + }
  275 + },
  276 + "semver": {
  277 + "version": "5.3.0",
  278 + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
  279 + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
  280 + "dev": true,
  281 + "optional": true
  282 + }
  283 + }
  284 + },
  285 + "node-sass": {
  286 + "version": "4.14.1",
  287 + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
  288 + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
  289 + "dev": true,
  290 + "optional": true,
  291 + "requires": {
  292 + "async-foreach": "^0.1.3",
  293 + "chalk": "^1.1.1",
  294 + "cross-spawn": "^3.0.0",
  295 + "gaze": "^1.0.0",
  296 + "get-stdin": "^4.0.1",
  297 + "glob": "^7.0.3",
  298 + "in-publish": "^2.0.0",
  299 + "lodash": "^4.17.15",
  300 + "meow": "^3.7.0",
  301 + "mkdirp": "^0.5.1",
  302 + "nan": "^2.13.2",
  303 + "node-gyp": "^3.8.0",
  304 + "npmlog": "^4.0.0",
  305 + "request": "^2.88.0",
  306 + "sass-graph": "2.2.5",
  307 + "stdout-stream": "^1.4.0",
  308 + "true-case-path": "^1.0.2"
  309 + },
  310 + "dependencies": {
  311 + "ansi-styles": {
  312 + "version": "2.2.1",
  313 + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
  314 + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
  315 + "dev": true,
  316 + "optional": true
  317 + },
  318 + "chalk": {
  319 + "version": "1.1.3",
  320 + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
  321 + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
  322 + "dev": true,
  323 + "optional": true,
  324 + "requires": {
  325 + "ansi-styles": "^2.2.1",
  326 + "escape-string-regexp": "^1.0.2",
  327 + "has-ansi": "^2.0.0",
  328 + "strip-ansi": "^3.0.0",
  329 + "supports-color": "^2.0.0"
  330 + }
  331 + },
  332 + "supports-color": {
  333 + "version": "2.0.0",
  334 + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
  335 + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
  336 + "dev": true,
  337 + "optional": true
  338 + }
  339 + }
  340 + },
151 341 "nopt": {
152 342 "version": "4.0.1",
153 343 "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
... ... @@ -158,6 +348,56 @@
158 348 "osenv": "^0.1.4"
159 349 }
160 350 },
  351 + "oauth-sign": {
  352 + "version": "0.9.0",
  353 + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
  354 + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
  355 + "dev": true,
  356 + "optional": true
  357 + },
  358 + "performance-now": {
  359 + "version": "2.1.0",
  360 + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
  361 + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
  362 + "dev": true,
  363 + "optional": true
  364 + },
  365 + "qs": {
  366 + "version": "6.5.2",
  367 + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
  368 + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
  369 + "dev": true,
  370 + "optional": true
  371 + },
  372 + "request": {
  373 + "version": "2.88.2",
  374 + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
  375 + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
  376 + "dev": true,
  377 + "optional": true,
  378 + "requires": {
  379 + "aws-sign2": "~0.7.0",
  380 + "aws4": "^1.8.0",
  381 + "caseless": "~0.12.0",
  382 + "combined-stream": "~1.0.6",
  383 + "extend": "~3.0.2",
  384 + "forever-agent": "~0.6.1",
  385 + "form-data": "~2.3.2",
  386 + "har-validator": "~5.1.3",
  387 + "http-signature": "~1.2.0",
  388 + "is-typedarray": "~1.0.0",
  389 + "isstream": "~0.1.2",
  390 + "json-stringify-safe": "~5.0.1",
  391 + "mime-types": "~2.1.19",
  392 + "oauth-sign": "~0.9.0",
  393 + "performance-now": "^2.1.0",
  394 + "qs": "~6.5.2",
  395 + "safe-buffer": "^5.1.2",
  396 + "tough-cookie": "~2.5.0",
  397 + "tunnel-agent": "^0.6.0",
  398 + "uuid": "^3.3.2"
  399 + }
  400 + },
161 401 "supports-color": {
162 402 "version": "5.5.0",
163 403 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
... ... @@ -166,6 +406,18 @@
166 406 "requires": {
167 407 "has-flag": "^3.0.0"
168 408 }
  409 + },
  410 + "tar": {
  411 + "version": "2.2.2",
  412 + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
  413 + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
  414 + "dev": true,
  415 + "optional": true,
  416 + "requires": {
  417 + "block-stream": "*",
  418 + "fstream": "^1.0.12",
  419 + "inherits": "2"
  420 + }
169 421 }
170 422 }
171 423 },
... ... @@ -272,6 +524,75 @@
272 524 "tsickle": "^0.21.0"
273 525 }
274 526 },
  527 + "@babel/code-frame": {
  528 + "version": "7.15.8",
  529 + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
  530 + "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
  531 + "dev": true,
  532 + "requires": {
  533 + "@babel/highlight": "^7.14.5"
  534 + }
  535 + },
  536 + "@babel/helper-validator-identifier": {
  537 + "version": "7.15.7",
  538 + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
  539 + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
  540 + "dev": true
  541 + },
  542 + "@babel/highlight": {
  543 + "version": "7.14.5",
  544 + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
  545 + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
  546 + "dev": true,
  547 + "requires": {
  548 + "@babel/helper-validator-identifier": "^7.14.5",
  549 + "chalk": "^2.0.0",
  550 + "js-tokens": "^4.0.0"
  551 + },
  552 + "dependencies": {
  553 + "ansi-styles": {
  554 + "version": "3.2.1",
  555 + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
  556 + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
  557 + "dev": true,
  558 + "requires": {
  559 + "color-convert": "^1.9.0"
  560 + }
  561 + },
  562 + "chalk": {
  563 + "version": "2.4.2",
  564 + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
  565 + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
  566 + "dev": true,
  567 + "requires": {
  568 + "ansi-styles": "^3.2.1",
  569 + "escape-string-regexp": "^1.0.5",
  570 + "supports-color": "^5.3.0"
  571 + }
  572 + },
  573 + "has-flag": {
  574 + "version": "3.0.0",
  575 + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
  576 + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
  577 + "dev": true
  578 + },
  579 + "js-tokens": {
  580 + "version": "4.0.0",
  581 + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
  582 + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
  583 + "dev": true
  584 + },
  585 + "supports-color": {
  586 + "version": "5.5.0",
  587 + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
  588 + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
  589 + "dev": true,
  590 + "requires": {
  591 + "has-flag": "^3.0.0"
  592 + }
  593 + }
  594 + }
  595 + },
275 596 "@ng-idle/core": {
276 597 "version": "2.0.0-beta.9",
277 598 "resolved": "https://registry.npmjs.org/@ng-idle/core/-/core-2.0.0-beta.9.tgz",
... ... @@ -345,11 +666,23 @@
345 666 "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.46.tgz",
346 667 "integrity": "sha512-U64bkZqTfFi4HXHqOckD1Uxvg+oPooCjD5bQ10t9xOG5Ke6cR8tFnvERXrQtrRWvgS428nhAL1V8qv1b88kgyQ=="
347 668 },
  669 + "@types/minimist": {
  670 + "version": "1.2.2",
  671 + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
  672 + "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
  673 + "dev": true
  674 + },
348 675 "@types/node": {
349 676 "version": "6.14.7",
350 677 "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.7.tgz",
351 678 "integrity": "sha512-YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew=="
352 679 },
  680 + "@types/normalize-package-data": {
  681 + "version": "2.4.1",
  682 + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
  683 + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
  684 + "dev": true
  685 + },
353 686 "@types/q": {
354 687 "version": "0.0.32",
355 688 "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
... ... @@ -491,8 +824,7 @@
491 824 "version": "1.0.1",
492 825 "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
493 826 "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
494   - "dev": true,
495   - "optional": true
  827 + "dev": true
496 828 },
497 829 "angular2-json2csv": {
498 830 "version": "1.1.2",
... ... @@ -700,11 +1032,10 @@
700 1032 "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
701 1033 },
702 1034 "are-we-there-yet": {
703   - "version": "1.1.5",
704   - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
705   - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
  1035 + "version": "1.1.7",
  1036 + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
  1037 + "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
706 1038 "dev": true,
707   - "optional": true,
708 1039 "requires": {
709 1040 "delegates": "^1.0.0",
710 1041 "readable-stream": "^2.0.6"
... ... @@ -871,8 +1202,7 @@
871 1202 "version": "0.1.3",
872 1203 "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
873 1204 "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
874   - "dev": true,
875   - "optional": true
  1205 + "dev": true
876 1206 },
877 1207 "asynckit": {
878 1208 "version": "0.4.0",
... ... @@ -2015,8 +2345,7 @@
2015 2345 "version": "1.1.0",
2016 2346 "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
2017 2347 "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
2018   - "dev": true,
2019   - "optional": true
  2348 + "dev": true
2020 2349 },
2021 2350 "constants-browserify": {
2022 2351 "version": "1.0.0",
... ... @@ -2489,6 +2818,16 @@
2489 2818 "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
2490 2819 "dev": true
2491 2820 },
  2821 + "decamelize-keys": {
  2822 + "version": "1.1.0",
  2823 + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
  2824 + "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
  2825 + "dev": true,
  2826 + "requires": {
  2827 + "decamelize": "^1.1.0",
  2828 + "map-obj": "^1.0.0"
  2829 + }
  2830 + },
2492 2831 "decode-uri-component": {
2493 2832 "version": "0.2.0",
2494 2833 "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
... ... @@ -2632,8 +2971,7 @@
2632 2971 "version": "1.0.0",
2633 2972 "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
2634 2973 "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
2635   - "dev": true,
2636   - "optional": true
  2974 + "dev": true
2637 2975 },
2638 2976 "denodeify": {
2639 2977 "version": "1.2.1",
... ... @@ -2965,6 +3303,12 @@
2965 3303 "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=",
2966 3304 "dev": true
2967 3305 },
  3306 + "emoji-regex": {
  3307 + "version": "7.0.3",
  3308 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  3309 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
  3310 + "dev": true
  3311 + },
2968 3312 "emojis-list": {
2969 3313 "version": "2.1.0",
2970 3314 "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
... ... @@ -3120,6 +3464,12 @@
3120 3464 "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
3121 3465 "dev": true
3122 3466 },
  3467 + "env-paths": {
  3468 + "version": "2.2.1",
  3469 + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
  3470 + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
  3471 + "dev": true
  3472 + },
3123 3473 "errno": {
3124 3474 "version": "0.1.7",
3125 3475 "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
... ... @@ -3951,6 +4301,15 @@
3951 4301 "universalify": "^0.1.0"
3952 4302 }
3953 4303 },
  4304 + "fs-minipass": {
  4305 + "version": "2.1.0",
  4306 + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
  4307 + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
  4308 + "dev": true,
  4309 + "requires": {
  4310 + "minipass": "^3.0.0"
  4311 + }
  4312 + },
3954 4313 "fs-write-stream-atomic": {
3955 4314 "version": "1.0.10",
3956 4315 "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
... ... @@ -4539,7 +4898,6 @@
4539 4898 "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
4540 4899 "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
4541 4900 "dev": true,
4542   - "optional": true,
4543 4901 "requires": {
4544 4902 "aproba": "^1.0.3",
4545 4903 "console-control-strings": "^1.0.0",
... ... @@ -4556,7 +4914,6 @@
4556 4914 "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
4557 4915 "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
4558 4916 "dev": true,
4559   - "optional": true,
4560 4917 "requires": {
4561 4918 "number-is-nan": "^1.0.0"
4562 4919 }
... ... @@ -4566,7 +4923,6 @@
4566 4923 "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
4567 4924 "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
4568 4925 "dev": true,
4569   - "optional": true,
4570 4926 "requires": {
4571 4927 "code-point-at": "^1.0.0",
4572 4928 "is-fullwidth-code-point": "^1.0.0",
... ... @@ -4580,7 +4936,6 @@
4580 4936 "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
4581 4937 "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
4582 4938 "dev": true,
4583   - "optional": true,
4584 4939 "requires": {
4585 4940 "globule": "^1.0.0"
4586 4941 }
... ... @@ -4723,11 +5078,10 @@
4723 5078 }
4724 5079 },
4725 5080 "globule": {
4726   - "version": "1.2.1",
4727   - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
4728   - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
  5081 + "version": "1.3.3",
  5082 + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz",
  5083 + "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
4729 5084 "dev": true,
4730   - "optional": true,
4731 5085 "requires": {
4732 5086 "glob": "~7.1.1",
4733 5087 "lodash": "~4.17.10",
... ... @@ -4812,6 +5166,12 @@
4812 5166 }
4813 5167 }
4814 5168 },
  5169 + "hard-rejection": {
  5170 + "version": "2.1.0",
  5171 + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
  5172 + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
  5173 + "dev": true
  5174 + },
4815 5175 "has": {
4816 5176 "version": "1.0.3",
4817 5177 "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
... ... @@ -5451,9 +5811,9 @@
5451 5811 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
5452 5812 },
5453 5813 "in-publish": {
5454   - "version": "2.0.0",
5455   - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
5456   - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
  5814 + "version": "2.0.1",
  5815 + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
  5816 + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
5457 5817 "dev": true,
5458 5818 "optional": true
5459 5819 },
... ... @@ -5613,6 +5973,15 @@
5613 5973 "ci-info": "^1.5.0"
5614 5974 }
5615 5975 },
  5976 + "is-core-module": {
  5977 + "version": "2.7.0",
  5978 + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
  5979 + "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
  5980 + "dev": true,
  5981 + "requires": {
  5982 + "has": "^1.0.3"
  5983 + }
  5984 + },
5616 5985 "is-data-descriptor": {
5617 5986 "version": "0.1.4",
5618 5987 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
... ... @@ -6132,6 +6501,12 @@
6132 6501 "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
6133 6502 "dev": true
6134 6503 },
  6504 + "json-parse-even-better-errors": {
  6505 + "version": "2.3.1",
  6506 + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
  6507 + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
  6508 + "dev": true
  6509 + },
6135 6510 "json-schema": {
6136 6511 "version": "0.2.3",
6137 6512 "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
... ... @@ -6561,6 +6936,12 @@
6561 6936 "ejs": "^2.5.7"
6562 6937 }
6563 6938 },
  6939 + "lines-and-columns": {
  6940 + "version": "1.1.6",
  6941 + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
  6942 + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
  6943 + "dev": true
  6944 + },
6564 6945 "listify": {
6565 6946 "version": "1.0.0",
6566 6947 "resolved": "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz",
... ... @@ -6962,6 +7343,12 @@
6962 7343 "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
6963 7344 "dev": true
6964 7345 },
  7346 + "min-indent": {
  7347 + "version": "1.0.1",
  7348 + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
  7349 + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
  7350 + "dev": true
  7351 + },
6965 7352 "minimalistic-assert": {
6966 7353 "version": "1.0.1",
6967 7354 "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
... ... @@ -6987,6 +7374,60 @@
6987 7374 "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
6988 7375 "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
6989 7376 },
  7377 + "minimist-options": {
  7378 + "version": "4.1.0",
  7379 + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
  7380 + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
  7381 + "dev": true,
  7382 + "requires": {
  7383 + "arrify": "^1.0.1",
  7384 + "is-plain-obj": "^1.1.0",
  7385 + "kind-of": "^6.0.3"
  7386 + },
  7387 + "dependencies": {
  7388 + "kind-of": {
  7389 + "version": "6.0.3",
  7390 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  7391 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
  7392 + "dev": true
  7393 + }
  7394 + }
  7395 + },
  7396 + "minipass": {
  7397 + "version": "3.1.5",
  7398 + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
  7399 + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
  7400 + "dev": true,
  7401 + "requires": {
  7402 + "yallist": "^4.0.0"
  7403 + },
  7404 + "dependencies": {
  7405 + "yallist": {
  7406 + "version": "4.0.0",
  7407 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
  7408 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
  7409 + "dev": true
  7410 + }
  7411 + }
  7412 + },
  7413 + "minizlib": {
  7414 + "version": "2.1.2",
  7415 + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
  7416 + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
  7417 + "dev": true,
  7418 + "requires": {
  7419 + "minipass": "^3.0.0",
  7420 + "yallist": "^4.0.0"
  7421 + },
  7422 + "dependencies": {
  7423 + "yallist": {
  7424 + "version": "4.0.0",
  7425 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
  7426 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
  7427 + "dev": true
  7428 + }
  7429 + }
  7430 + },
6990 7431 "mississippi": {
6991 7432 "version": "2.0.0",
6992 7433 "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
... ... @@ -7096,8 +7537,7 @@
7096 7537 "version": "2.14.0",
7097 7538 "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
7098 7539 "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
7099   - "dev": true,
7100   - "optional": true
  7540 + "dev": true
7101 7541 },
7102 7542 "nanomatch": {
7103 7543 "version": "1.2.13",
... ... @@ -7247,34 +7687,30 @@
7247 7687 "dev": true
7248 7688 },
7249 7689 "node-gyp": {
7250   - "version": "3.8.0",
7251   - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
7252   - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
  7690 + "version": "7.1.2",
  7691 + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
  7692 + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
7253 7693 "dev": true,
7254   - "optional": true,
7255 7694 "requires": {
7256   - "fstream": "^1.0.0",
7257   - "glob": "^7.0.3",
7258   - "graceful-fs": "^4.1.2",
7259   - "mkdirp": "^0.5.0",
7260   - "nopt": "2 || 3",
7261   - "npmlog": "0 || 1 || 2 || 3 || 4",
7262   - "osenv": "0",
7263   - "request": "^2.87.0",
7264   - "rimraf": "2",
7265   - "semver": "~5.3.0",
7266   - "tar": "^2.0.0",
7267   - "which": "1"
  7695 + "env-paths": "^2.2.0",
  7696 + "glob": "^7.1.4",
  7697 + "graceful-fs": "^4.2.3",
  7698 + "nopt": "^5.0.0",
  7699 + "npmlog": "^4.1.2",
  7700 + "request": "^2.88.2",
  7701 + "rimraf": "^3.0.2",
  7702 + "semver": "^7.3.2",
  7703 + "tar": "^6.0.2",
  7704 + "which": "^2.0.2"
7268 7705 },
7269 7706 "dependencies": {
7270 7707 "ajv": {
7271   - "version": "6.10.2",
7272   - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
7273   - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
  7708 + "version": "6.12.6",
  7709 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
  7710 + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
7274 7711 "dev": true,
7275   - "optional": true,
7276 7712 "requires": {
7277   - "fast-deep-equal": "^2.0.1",
  7713 + "fast-deep-equal": "^3.1.1",
7278 7714 "fast-json-stable-stringify": "^2.0.0",
7279 7715 "json-schema-traverse": "^0.4.1",
7280 7716 "uri-js": "^4.2.2"
... ... @@ -7284,50 +7720,50 @@
7284 7720 "version": "1.0.0",
7285 7721 "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
7286 7722 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
7287   - "dev": true,
7288   - "optional": true
  7723 + "dev": true
7289 7724 },
7290 7725 "aws-sign2": {
7291 7726 "version": "0.7.0",
7292 7727 "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
7293 7728 "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
7294   - "dev": true,
7295   - "optional": true
  7729 + "dev": true
7296 7730 },
7297 7731 "fast-deep-equal": {
7298   - "version": "2.0.1",
7299   - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
7300   - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
7301   - "dev": true,
7302   - "optional": true
  7732 + "version": "3.1.3",
  7733 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
  7734 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
  7735 + "dev": true
7303 7736 },
7304 7737 "form-data": {
7305 7738 "version": "2.3.3",
7306 7739 "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
7307 7740 "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
7308 7741 "dev": true,
7309   - "optional": true,
7310 7742 "requires": {
7311 7743 "asynckit": "^0.4.0",
7312 7744 "combined-stream": "^1.0.6",
7313 7745 "mime-types": "^2.1.12"
7314 7746 }
7315 7747 },
  7748 + "graceful-fs": {
  7749 + "version": "4.2.8",
  7750 + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
  7751 + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
  7752 + "dev": true
  7753 + },
7316 7754 "har-schema": {
7317 7755 "version": "2.0.0",
7318 7756 "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
7319 7757 "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
7320   - "dev": true,
7321   - "optional": true
  7758 + "dev": true
7322 7759 },
7323 7760 "har-validator": {
7324   - "version": "5.1.3",
7325   - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
7326   - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
  7761 + "version": "5.1.5",
  7762 + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
  7763 + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
7327 7764 "dev": true,
7328   - "optional": true,
7329 7765 "requires": {
7330   - "ajv": "^6.5.5",
  7766 + "ajv": "^6.12.3",
7331 7767 "har-schema": "^2.0.0"
7332 7768 }
7333 7769 },
... ... @@ -7336,7 +7772,6 @@
7336 7772 "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
7337 7773 "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
7338 7774 "dev": true,
7339   - "optional": true,
7340 7775 "requires": {
7341 7776 "assert-plus": "^1.0.0",
7342 7777 "jsprim": "^1.2.2",
... ... @@ -7347,15 +7782,22 @@
7347 7782 "version": "0.4.1",
7348 7783 "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
7349 7784 "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
  7785 + "dev": true
  7786 + },
  7787 + "lru-cache": {
  7788 + "version": "6.0.0",
  7789 + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
  7790 + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
7350 7791 "dev": true,
7351   - "optional": true
  7792 + "requires": {
  7793 + "yallist": "^4.0.0"
  7794 + }
7352 7795 },
7353 7796 "nopt": {
7354   - "version": "3.0.6",
7355   - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
7356   - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
  7797 + "version": "5.0.0",
  7798 + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
  7799 + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
7357 7800 "dev": true,
7358   - "optional": true,
7359 7801 "requires": {
7360 7802 "abbrev": "1"
7361 7803 }
... ... @@ -7364,36 +7806,25 @@
7364 7806 "version": "0.9.0",
7365 7807 "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
7366 7808 "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
7367   - "dev": true,
7368   - "optional": true
  7809 + "dev": true
7369 7810 },
7370 7811 "performance-now": {
7371 7812 "version": "2.1.0",
7372 7813 "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
7373 7814 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
7374   - "dev": true,
7375   - "optional": true
7376   - },
7377   - "punycode": {
7378   - "version": "1.4.1",
7379   - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
7380   - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
7381   - "dev": true,
7382   - "optional": true
  7815 + "dev": true
7383 7816 },
7384 7817 "qs": {
7385 7818 "version": "6.5.2",
7386 7819 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
7387 7820 "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
7388   - "dev": true,
7389   - "optional": true
  7821 + "dev": true
7390 7822 },
7391 7823 "request": {
7392   - "version": "2.88.0",
7393   - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
7394   - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
  7824 + "version": "2.88.2",
  7825 + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
  7826 + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
7395 7827 "dev": true,
7396   - "optional": true,
7397 7828 "requires": {
7398 7829 "aws-sign2": "~0.7.0",
7399 7830 "aws4": "^1.8.0",
... ... @@ -7402,7 +7833,7 @@
7402 7833 "extend": "~3.0.2",
7403 7834 "forever-agent": "~0.6.1",
7404 7835 "form-data": "~2.3.2",
7405   - "har-validator": "~5.1.0",
  7836 + "har-validator": "~5.1.3",
7406 7837 "http-signature": "~1.2.0",
7407 7838 "is-typedarray": "~1.0.0",
7408 7839 "isstream": "~0.1.2",
... ... @@ -7412,28 +7843,43 @@
7412 7843 "performance-now": "^2.1.0",
7413 7844 "qs": "~6.5.2",
7414 7845 "safe-buffer": "^5.1.2",
7415   - "tough-cookie": "~2.4.3",
  7846 + "tough-cookie": "~2.5.0",
7416 7847 "tunnel-agent": "^0.6.0",
7417 7848 "uuid": "^3.3.2"
7418 7849 }
7419 7850 },
  7851 + "rimraf": {
  7852 + "version": "3.0.2",
  7853 + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
  7854 + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
  7855 + "dev": true,
  7856 + "requires": {
  7857 + "glob": "^7.1.3"
  7858 + }
  7859 + },
7420 7860 "semver": {
7421   - "version": "5.3.0",
7422   - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
7423   - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
  7861 + "version": "7.3.5",
  7862 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
  7863 + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
7424 7864 "dev": true,
7425   - "optional": true
  7865 + "requires": {
  7866 + "lru-cache": "^6.0.0"
  7867 + }
7426 7868 },
7427   - "tough-cookie": {
7428   - "version": "2.4.3",
7429   - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
7430   - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
  7869 + "which": {
  7870 + "version": "2.0.2",
  7871 + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
  7872 + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
7431 7873 "dev": true,
7432   - "optional": true,
7433 7874 "requires": {
7434   - "psl": "^1.1.24",
7435   - "punycode": "^1.4.1"
  7875 + "isexe": "^2.0.0"
7436 7876 }
  7877 + },
  7878 + "yallist": {
  7879 + "version": "4.0.0",
  7880 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
  7881 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
  7882 + "dev": true
7437 7883 }
7438 7884 }
7439 7885 },
... ... @@ -7483,39 +7929,35 @@
7483 7929 "dev": true
7484 7930 },
7485 7931 "node-sass": {
7486   - "version": "4.12.0",
7487   - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
7488   - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
  7932 + "version": "6.0.1",
  7933 + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz",
  7934 + "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==",
7489 7935 "dev": true,
7490   - "optional": true,
7491 7936 "requires": {
7492 7937 "async-foreach": "^0.1.3",
7493 7938 "chalk": "^1.1.1",
7494   - "cross-spawn": "^3.0.0",
  7939 + "cross-spawn": "^7.0.3",
7495 7940 "gaze": "^1.0.0",
7496 7941 "get-stdin": "^4.0.1",
7497 7942 "glob": "^7.0.3",
7498   - "in-publish": "^2.0.0",
7499   - "lodash": "^4.17.11",
7500   - "meow": "^3.7.0",
7501   - "mkdirp": "^0.5.1",
  7943 + "lodash": "^4.17.15",
  7944 + "meow": "^9.0.0",
7502 7945 "nan": "^2.13.2",
7503   - "node-gyp": "^3.8.0",
  7946 + "node-gyp": "^7.1.0",
7504 7947 "npmlog": "^4.0.0",
7505 7948 "request": "^2.88.0",
7506   - "sass-graph": "^2.2.4",
  7949 + "sass-graph": "2.2.5",
7507 7950 "stdout-stream": "^1.4.0",
7508 7951 "true-case-path": "^1.0.2"
7509 7952 },
7510 7953 "dependencies": {
7511 7954 "ajv": {
7512   - "version": "6.10.2",
7513   - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
7514   - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
  7955 + "version": "6.12.6",
  7956 + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
  7957 + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
7515 7958 "dev": true,
7516   - "optional": true,
7517 7959 "requires": {
7518   - "fast-deep-equal": "^2.0.1",
  7960 + "fast-deep-equal": "^3.1.1",
7519 7961 "fast-json-stable-stringify": "^2.0.0",
7520 7962 "json-schema-traverse": "^0.4.1",
7521 7963 "uri-js": "^4.2.2"
... ... @@ -7525,40 +7967,63 @@
7525 7967 "version": "1.0.0",
7526 7968 "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
7527 7969 "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
7528   - "dev": true,
7529   - "optional": true
  7970 + "dev": true
7530 7971 },
7531 7972 "aws-sign2": {
7532 7973 "version": "0.7.0",
7533 7974 "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
7534 7975 "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
  7976 + "dev": true
  7977 + },
  7978 + "camelcase": {
  7979 + "version": "5.3.1",
  7980 + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
  7981 + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
  7982 + "dev": true
  7983 + },
  7984 + "camelcase-keys": {
  7985 + "version": "6.2.2",
  7986 + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
  7987 + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
7535 7988 "dev": true,
7536   - "optional": true
  7989 + "requires": {
  7990 + "camelcase": "^5.3.1",
  7991 + "map-obj": "^4.0.0",
  7992 + "quick-lru": "^4.0.1"
  7993 + }
7537 7994 },
7538 7995 "cross-spawn": {
7539   - "version": "3.0.1",
7540   - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
7541   - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
  7996 + "version": "7.0.3",
  7997 + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
  7998 + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
7542 7999 "dev": true,
7543   - "optional": true,
7544 8000 "requires": {
7545   - "lru-cache": "^4.0.1",
7546   - "which": "^1.2.9"
  8001 + "path-key": "^3.1.0",
  8002 + "shebang-command": "^2.0.0",
  8003 + "which": "^2.0.1"
7547 8004 }
7548 8005 },
7549 8006 "fast-deep-equal": {
7550   - "version": "2.0.1",
7551   - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
7552   - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
  8007 + "version": "3.1.3",
  8008 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
  8009 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
  8010 + "dev": true
  8011 + },
  8012 + "find-up": {
  8013 + "version": "4.1.0",
  8014 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
  8015 + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
7553 8016 "dev": true,
7554   - "optional": true
  8017 + "requires": {
  8018 + "locate-path": "^5.0.0",
  8019 + "path-exists": "^4.0.0"
  8020 + }
7555 8021 },
7556 8022 "form-data": {
7557 8023 "version": "2.3.3",
7558 8024 "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
7559 8025 "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
7560 8026 "dev": true,
7561   - "optional": true,
7562 8027 "requires": {
7563 8028 "asynckit": "^0.4.0",
7564 8029 "combined-stream": "^1.0.6",
... ... @@ -7569,73 +8034,250 @@
7569 8034 "version": "2.0.0",
7570 8035 "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
7571 8036 "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
7572   - "dev": true,
7573   - "optional": true
  8037 + "dev": true
7574 8038 },
7575 8039 "har-validator": {
7576   - "version": "5.1.3",
7577   - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
7578   - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
  8040 + "version": "5.1.5",
  8041 + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
  8042 + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
  8043 + "dev": true,
  8044 + "requires": {
  8045 + "ajv": "^6.12.3",
  8046 + "har-schema": "^2.0.0"
  8047 + }
  8048 + },
  8049 + "hosted-git-info": {
  8050 + "version": "4.0.2",
  8051 + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
  8052 + "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
  8053 + "dev": true,
  8054 + "requires": {
  8055 + "lru-cache": "^6.0.0"
  8056 + }
  8057 + },
  8058 + "http-signature": {
  8059 + "version": "1.2.0",
  8060 + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
  8061 + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
  8062 + "dev": true,
  8063 + "requires": {
  8064 + "assert-plus": "^1.0.0",
  8065 + "jsprim": "^1.2.2",
  8066 + "sshpk": "^1.7.0"
  8067 + }
  8068 + },
  8069 + "indent-string": {
  8070 + "version": "4.0.0",
  8071 + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
  8072 + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
  8073 + "dev": true
  8074 + },
  8075 + "json-schema-traverse": {
  8076 + "version": "0.4.1",
  8077 + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
  8078 + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
  8079 + "dev": true
  8080 + },
  8081 + "locate-path": {
  8082 + "version": "5.0.0",
  8083 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
  8084 + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
  8085 + "dev": true,
  8086 + "requires": {
  8087 + "p-locate": "^4.1.0"
  8088 + }
  8089 + },
  8090 + "lru-cache": {
  8091 + "version": "6.0.0",
  8092 + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
  8093 + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
7579 8094 "dev": true,
7580   - "optional": true,
7581 8095 "requires": {
7582   - "ajv": "^6.5.5",
7583   - "har-schema": "^2.0.0"
  8096 + "yallist": "^4.0.0"
7584 8097 }
7585 8098 },
7586   - "http-signature": {
7587   - "version": "1.2.0",
7588   - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
7589   - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
  8099 + "map-obj": {
  8100 + "version": "4.3.0",
  8101 + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
  8102 + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
  8103 + "dev": true
  8104 + },
  8105 + "meow": {
  8106 + "version": "9.0.0",
  8107 + "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
  8108 + "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
7590 8109 "dev": true,
7591   - "optional": true,
7592 8110 "requires": {
7593   - "assert-plus": "^1.0.0",
7594   - "jsprim": "^1.2.2",
7595   - "sshpk": "^1.7.0"
  8111 + "@types/minimist": "^1.2.0",
  8112 + "camelcase-keys": "^6.2.2",
  8113 + "decamelize": "^1.2.0",
  8114 + "decamelize-keys": "^1.1.0",
  8115 + "hard-rejection": "^2.1.0",
  8116 + "minimist-options": "4.1.0",
  8117 + "normalize-package-data": "^3.0.0",
  8118 + "read-pkg-up": "^7.0.1",
  8119 + "redent": "^3.0.0",
  8120 + "trim-newlines": "^3.0.0",
  8121 + "type-fest": "^0.18.0",
  8122 + "yargs-parser": "^20.2.3"
7596 8123 }
7597 8124 },
7598   - "json-schema-traverse": {
7599   - "version": "0.4.1",
7600   - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
7601   - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
  8125 + "normalize-package-data": {
  8126 + "version": "3.0.3",
  8127 + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
  8128 + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
7602 8129 "dev": true,
7603   - "optional": true
  8130 + "requires": {
  8131 + "hosted-git-info": "^4.0.1",
  8132 + "is-core-module": "^2.5.0",
  8133 + "semver": "^7.3.4",
  8134 + "validate-npm-package-license": "^3.0.1"
  8135 + }
7604 8136 },
7605 8137 "oauth-sign": {
7606 8138 "version": "0.9.0",
7607 8139 "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
7608 8140 "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
  8141 + "dev": true
  8142 + },
  8143 + "p-limit": {
  8144 + "version": "2.3.0",
  8145 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
  8146 + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
7609 8147 "dev": true,
7610   - "optional": true
  8148 + "requires": {
  8149 + "p-try": "^2.0.0"
  8150 + }
  8151 + },
  8152 + "p-locate": {
  8153 + "version": "4.1.0",
  8154 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
  8155 + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
  8156 + "dev": true,
  8157 + "requires": {
  8158 + "p-limit": "^2.2.0"
  8159 + }
  8160 + },
  8161 + "p-try": {
  8162 + "version": "2.2.0",
  8163 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
  8164 + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
  8165 + "dev": true
  8166 + },
  8167 + "parse-json": {
  8168 + "version": "5.2.0",
  8169 + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
  8170 + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
  8171 + "dev": true,
  8172 + "requires": {
  8173 + "@babel/code-frame": "^7.0.0",
  8174 + "error-ex": "^1.3.1",
  8175 + "json-parse-even-better-errors": "^2.3.0",
  8176 + "lines-and-columns": "^1.1.6"
  8177 + }
  8178 + },
  8179 + "path-exists": {
  8180 + "version": "4.0.0",
  8181 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
  8182 + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
  8183 + "dev": true
  8184 + },
  8185 + "path-key": {
  8186 + "version": "3.1.1",
  8187 + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
  8188 + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
  8189 + "dev": true
7611 8190 },
7612 8191 "performance-now": {
7613 8192 "version": "2.1.0",
7614 8193 "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
7615 8194 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
7616   - "dev": true,
7617   - "optional": true
7618   - },
7619   - "punycode": {
7620   - "version": "1.4.1",
7621   - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
7622   - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
7623   - "dev": true,
7624   - "optional": true
  8195 + "dev": true
7625 8196 },
7626 8197 "qs": {
7627 8198 "version": "6.5.2",
7628 8199 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
7629 8200 "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
  8201 + "dev": true
  8202 + },
  8203 + "read-pkg": {
  8204 + "version": "5.2.0",
  8205 + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
  8206 + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
7630 8207 "dev": true,
7631   - "optional": true
  8208 + "requires": {
  8209 + "@types/normalize-package-data": "^2.4.0",
  8210 + "normalize-package-data": "^2.5.0",
  8211 + "parse-json": "^5.0.0",
  8212 + "type-fest": "^0.6.0"
  8213 + },
  8214 + "dependencies": {
  8215 + "hosted-git-info": {
  8216 + "version": "2.8.9",
  8217 + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
  8218 + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
  8219 + "dev": true
  8220 + },
  8221 + "normalize-package-data": {
  8222 + "version": "2.5.0",
  8223 + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
  8224 + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
  8225 + "dev": true,
  8226 + "requires": {
  8227 + "hosted-git-info": "^2.1.4",
  8228 + "resolve": "^1.10.0",
  8229 + "semver": "2 || 3 || 4 || 5",
  8230 + "validate-npm-package-license": "^3.0.1"
  8231 + }
  8232 + },
  8233 + "semver": {
  8234 + "version": "5.7.1",
  8235 + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
  8236 + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
  8237 + "dev": true
  8238 + },
  8239 + "type-fest": {
  8240 + "version": "0.6.0",
  8241 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
  8242 + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
  8243 + "dev": true
  8244 + }
  8245 + }
  8246 + },
  8247 + "read-pkg-up": {
  8248 + "version": "7.0.1",
  8249 + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
  8250 + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
  8251 + "dev": true,
  8252 + "requires": {
  8253 + "find-up": "^4.1.0",
  8254 + "read-pkg": "^5.2.0",
  8255 + "type-fest": "^0.8.1"
  8256 + },
  8257 + "dependencies": {
  8258 + "type-fest": {
  8259 + "version": "0.8.1",
  8260 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
  8261 + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
  8262 + "dev": true
  8263 + }
  8264 + }
  8265 + },
  8266 + "redent": {
  8267 + "version": "3.0.0",
  8268 + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
  8269 + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
  8270 + "dev": true,
  8271 + "requires": {
  8272 + "indent-string": "^4.0.0",
  8273 + "strip-indent": "^3.0.0"
  8274 + }
7632 8275 },
7633 8276 "request": {
7634   - "version": "2.88.0",
7635   - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
7636   - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
  8277 + "version": "2.88.2",
  8278 + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
  8279 + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
7637 8280 "dev": true,
7638   - "optional": true,
7639 8281 "requires": {
7640 8282 "aws-sign2": "~0.7.0",
7641 8283 "aws4": "^1.8.0",
... ... @@ -7644,7 +8286,7 @@
7644 8286 "extend": "~3.0.2",
7645 8287 "forever-agent": "~0.6.1",
7646 8288 "form-data": "~2.3.2",
7647   - "har-validator": "~5.1.0",
  8289 + "har-validator": "~5.1.3",
7648 8290 "http-signature": "~1.2.0",
7649 8291 "is-typedarray": "~1.0.0",
7650 8292 "isstream": "~0.1.2",
... ... @@ -7654,21 +8296,64 @@
7654 8296 "performance-now": "^2.1.0",
7655 8297 "qs": "~6.5.2",
7656 8298 "safe-buffer": "^5.1.2",
7657   - "tough-cookie": "~2.4.3",
  8299 + "tough-cookie": "~2.5.0",
7658 8300 "tunnel-agent": "^0.6.0",
7659 8301 "uuid": "^3.3.2"
7660 8302 }
7661 8303 },
7662   - "tough-cookie": {
7663   - "version": "2.4.3",
7664   - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
7665   - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
  8304 + "semver": {
  8305 + "version": "7.3.5",
  8306 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
  8307 + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
7666 8308 "dev": true,
7667   - "optional": true,
7668 8309 "requires": {
7669   - "psl": "^1.1.24",
7670   - "punycode": "^1.4.1"
  8310 + "lru-cache": "^6.0.0"
  8311 + }
  8312 + },
  8313 + "shebang-command": {
  8314 + "version": "2.0.0",
  8315 + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
  8316 + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
  8317 + "dev": true,
  8318 + "requires": {
  8319 + "shebang-regex": "^3.0.0"
  8320 + }
  8321 + },
  8322 + "shebang-regex": {
  8323 + "version": "3.0.0",
  8324 + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
  8325 + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
  8326 + "dev": true
  8327 + },
  8328 + "strip-indent": {
  8329 + "version": "3.0.0",
  8330 + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
  8331 + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
  8332 + "dev": true,
  8333 + "requires": {
  8334 + "min-indent": "^1.0.0"
  8335 + }
  8336 + },
  8337 + "trim-newlines": {
  8338 + "version": "3.0.1",
  8339 + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
  8340 + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
  8341 + "dev": true
  8342 + },
  8343 + "which": {
  8344 + "version": "2.0.2",
  8345 + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
  8346 + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
  8347 + "dev": true,
  8348 + "requires": {
  8349 + "isexe": "^2.0.0"
7671 8350 }
  8351 + },
  8352 + "yallist": {
  8353 + "version": "4.0.0",
  8354 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
  8355 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
  8356 + "dev": true
7672 8357 }
7673 8358 }
7674 8359 },
... ... @@ -7729,7 +8414,6 @@
7729 8414 "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
7730 8415 "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
7731 8416 "dev": true,
7732   - "optional": true,
7733 8417 "requires": {
7734 8418 "are-we-there-yet": "~1.1.2",
7735 8419 "console-control-strings": "~1.1.0",
... ... @@ -9330,6 +10014,12 @@
9330 10014 "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
9331 10015 "dev": true
9332 10016 },
  10017 + "quick-lru": {
  10018 + "version": "4.0.1",
  10019 + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
  10020 + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
  10021 + "dev": true
  10022 + },
9333 10023 "randomatic": {
9334 10024 "version": "3.1.1",
9335 10025 "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
... ... @@ -9879,16 +10569,15 @@
9879 10569 "dev": true
9880 10570 },
9881 10571 "sass-graph": {
9882   - "version": "2.2.4",
9883   - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
9884   - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
  10572 + "version": "2.2.5",
  10573 + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
  10574 + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
9885 10575 "dev": true,
9886   - "optional": true,
9887 10576 "requires": {
9888 10577 "glob": "^7.0.0",
9889 10578 "lodash": "^4.0.0",
9890 10579 "scss-tokenizer": "^0.2.3",
9891   - "yargs": "^7.0.0"
  10580 + "yargs": "^13.3.2"
9892 10581 }
9893 10582 },
9894 10583 "sass-loader": {
... ... @@ -9933,7 +10622,6 @@
9933 10622 "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
9934 10623 "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
9935 10624 "dev": true,
9936   - "optional": true,
9937 10625 "requires": {
9938 10626 "js-base64": "^2.1.8",
9939 10627 "source-map": "^0.4.2"
... ... @@ -9944,7 +10632,6 @@
9944 10632 "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
9945 10633 "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
9946 10634 "dev": true,
9947   - "optional": true,
9948 10635 "requires": {
9949 10636 "amdefine": ">=0.0.4"
9950 10637 }
... ... @@ -10722,7 +11409,6 @@
10722 11409 "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
10723 11410 "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
10724 11411 "dev": true,
10725   - "optional": true,
10726 11412 "requires": {
10727 11413 "readable-stream": "^2.0.1"
10728 11414 }
... ... @@ -10980,15 +11666,37 @@
10980 11666 "dev": true
10981 11667 },
10982 11668 "tar": {
10983   - "version": "2.2.2",
10984   - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
10985   - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
  11669 + "version": "6.1.11",
  11670 + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
  11671 + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
10986 11672 "dev": true,
10987   - "optional": true,
10988 11673 "requires": {
10989   - "block-stream": "*",
10990   - "fstream": "^1.0.12",
10991   - "inherits": "2"
  11674 + "chownr": "^2.0.0",
  11675 + "fs-minipass": "^2.0.0",
  11676 + "minipass": "^3.0.0",
  11677 + "minizlib": "^2.1.1",
  11678 + "mkdirp": "^1.0.3",
  11679 + "yallist": "^4.0.0"
  11680 + },
  11681 + "dependencies": {
  11682 + "chownr": {
  11683 + "version": "2.0.0",
  11684 + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
  11685 + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
  11686 + "dev": true
  11687 + },
  11688 + "mkdirp": {
  11689 + "version": "1.0.4",
  11690 + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
  11691 + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
  11692 + "dev": true
  11693 + },
  11694 + "yallist": {
  11695 + "version": "4.0.0",
  11696 + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
  11697 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
  11698 + "dev": true
  11699 + }
10992 11700 }
10993 11701 },
10994 11702 "term-size": {
... ... @@ -11167,7 +11875,6 @@
11167 11875 "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
11168 11876 "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
11169 11877 "dev": true,
11170   - "optional": true,
11171 11878 "requires": {
11172 11879 "glob": "^7.1.2"
11173 11880 }
... ... @@ -11330,6 +12037,12 @@
11330 12037 "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==",
11331 12038 "dev": true
11332 12039 },
  12040 + "type-fest": {
  12041 + "version": "0.18.1",
  12042 + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
  12043 + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
  12044 + "dev": true
  12045 + },
11333 12046 "type-is": {
11334 12047 "version": "1.6.18",
11335 12048 "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
... ... @@ -12542,7 +13255,6 @@
12542 13255 "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
12543 13256 "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
12544 13257 "dev": true,
12545   - "optional": true,
12546 13258 "requires": {
12547 13259 "string-width": "^1.0.2 || 2"
12548 13260 }
... ... @@ -12680,83 +13392,164 @@
12680 13392 "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
12681 13393 },
12682 13394 "yargs": {
12683   - "version": "7.1.0",
12684   - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
12685   - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
  13395 + "version": "13.3.2",
  13396 + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
  13397 + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
12686 13398 "dev": true,
12687   - "optional": true,
12688 13399 "requires": {
12689   - "camelcase": "^3.0.0",
12690   - "cliui": "^3.2.0",
12691   - "decamelize": "^1.1.1",
12692   - "get-caller-file": "^1.0.1",
12693   - "os-locale": "^1.4.0",
12694   - "read-pkg-up": "^1.0.1",
  13400 + "cliui": "^5.0.0",
  13401 + "find-up": "^3.0.0",
  13402 + "get-caller-file": "^2.0.1",
12695 13403 "require-directory": "^2.1.1",
12696   - "require-main-filename": "^1.0.1",
  13404 + "require-main-filename": "^2.0.0",
12697 13405 "set-blocking": "^2.0.0",
12698   - "string-width": "^1.0.2",
12699   - "which-module": "^1.0.0",
12700   - "y18n": "^3.2.1",
12701   - "yargs-parser": "^5.0.0"
  13406 + "string-width": "^3.0.0",
  13407 + "which-module": "^2.0.0",
  13408 + "y18n": "^4.0.0",
  13409 + "yargs-parser": "^13.1.2"
12702 13410 },
12703 13411 "dependencies": {
  13412 + "ansi-regex": {
  13413 + "version": "4.1.0",
  13414 + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
  13415 + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
  13416 + "dev": true
  13417 + },
  13418 + "ansi-styles": {
  13419 + "version": "3.2.1",
  13420 + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
  13421 + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
  13422 + "dev": true,
  13423 + "requires": {
  13424 + "color-convert": "^1.9.0"
  13425 + }
  13426 + },
12704 13427 "camelcase": {
  13428 + "version": "5.3.1",
  13429 + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
  13430 + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
  13431 + "dev": true
  13432 + },
  13433 + "cliui": {
  13434 + "version": "5.0.0",
  13435 + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
  13436 + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
  13437 + "dev": true,
  13438 + "requires": {
  13439 + "string-width": "^3.1.0",
  13440 + "strip-ansi": "^5.2.0",
  13441 + "wrap-ansi": "^5.1.0"
  13442 + }
  13443 + },
  13444 + "find-up": {
12705 13445 "version": "3.0.0",
12706   - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
12707   - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
  13446 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
  13447 + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
12708 13448 "dev": true,
12709   - "optional": true
  13449 + "requires": {
  13450 + "locate-path": "^3.0.0"
  13451 + }
12710 13452 },
12711   - "is-fullwidth-code-point": {
12712   - "version": "1.0.0",
12713   - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
12714   - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
  13453 + "get-caller-file": {
  13454 + "version": "2.0.5",
  13455 + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
  13456 + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
  13457 + "dev": true
  13458 + },
  13459 + "locate-path": {
  13460 + "version": "3.0.0",
  13461 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
  13462 + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
12715 13463 "dev": true,
12716   - "optional": true,
12717 13464 "requires": {
12718   - "number-is-nan": "^1.0.0"
  13465 + "p-locate": "^3.0.0",
  13466 + "path-exists": "^3.0.0"
  13467 + }
  13468 + },
  13469 + "p-limit": {
  13470 + "version": "2.3.0",
  13471 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
  13472 + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
  13473 + "dev": true,
  13474 + "requires": {
  13475 + "p-try": "^2.0.0"
  13476 + }
  13477 + },
  13478 + "p-locate": {
  13479 + "version": "3.0.0",
  13480 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
  13481 + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
  13482 + "dev": true,
  13483 + "requires": {
  13484 + "p-limit": "^2.0.0"
12719 13485 }
12720 13486 },
  13487 + "p-try": {
  13488 + "version": "2.2.0",
  13489 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
  13490 + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
  13491 + "dev": true
  13492 + },
  13493 + "require-main-filename": {
  13494 + "version": "2.0.0",
  13495 + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
  13496 + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
  13497 + "dev": true
  13498 + },
12721 13499 "string-width": {
12722   - "version": "1.0.2",
12723   - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
12724   - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
  13500 + "version": "3.1.0",
  13501 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  13502 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
12725 13503 "dev": true,
12726   - "optional": true,
12727 13504 "requires": {
12728   - "code-point-at": "^1.0.0",
12729   - "is-fullwidth-code-point": "^1.0.0",
12730   - "strip-ansi": "^3.0.0"
  13505 + "emoji-regex": "^7.0.1",
  13506 + "is-fullwidth-code-point": "^2.0.0",
  13507 + "strip-ansi": "^5.1.0"
12731 13508 }
12732 13509 },
12733   - "y18n": {
12734   - "version": "3.2.1",
12735   - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
12736   - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
  13510 + "strip-ansi": {
  13511 + "version": "5.2.0",
  13512 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  13513 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
12737 13514 "dev": true,
12738   - "optional": true
  13515 + "requires": {
  13516 + "ansi-regex": "^4.1.0"
  13517 + }
  13518 + },
  13519 + "which-module": {
  13520 + "version": "2.0.0",
  13521 + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
  13522 + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
  13523 + "dev": true
  13524 + },
  13525 + "wrap-ansi": {
  13526 + "version": "5.1.0",
  13527 + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
  13528 + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
  13529 + "dev": true,
  13530 + "requires": {
  13531 + "ansi-styles": "^3.2.0",
  13532 + "string-width": "^3.0.0",
  13533 + "strip-ansi": "^5.0.0"
  13534 + }
  13535 + },
  13536 + "yargs-parser": {
  13537 + "version": "13.1.2",
  13538 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
  13539 + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
  13540 + "dev": true,
  13541 + "requires": {
  13542 + "camelcase": "^5.0.0",
  13543 + "decamelize": "^1.2.0"
  13544 + }
12739 13545 }
12740 13546 }
12741 13547 },
12742 13548 "yargs-parser": {
12743   - "version": "5.0.0",
12744   - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
12745   - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
12746   - "dev": true,
12747   - "optional": true,
12748   - "requires": {
12749   - "camelcase": "^3.0.0"
12750   - },
12751   - "dependencies": {
12752   - "camelcase": {
12753   - "version": "3.0.0",
12754   - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
12755   - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
12756   - "dev": true,
12757   - "optional": true
12758   - }
12759   - }
  13549 + "version": "20.2.9",
  13550 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
  13551 + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
  13552 + "dev": true
12760 13553 },
12761 13554 "yeast": {
12762 13555 "version": "0.1.2",
... ...
400-SOURCECODE/Admin/package.json
... ... @@ -69,6 +69,7 @@
69 69 "karma-coverage-istanbul-reporter": "^1.2.1",
70 70 "karma-jasmine": "~1.1.0",
71 71 "karma-jasmine-html-reporter": "^0.2.2",
  72 + "node-sass": "^6.0.1",
72 73 "protractor": "~5.1.2",
73 74 "ts-node": "~3.2.0",
74 75 "tslint": "~5.7.0",
... ...
400-SOURCECODE/Admin/src/app/app.component.html
... ... @@ -7,7 +7,7 @@
7 7 <div class="">
8 8 <div class="btn-group pull-right">
9 9 <ul class="nav navbar-nav navbar-right visible-sm visible-md">
10   - <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="login.html"><i class="fa fa-power-off"></i></a></li>
  10 + <li class="marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a (click)="logout()"><i class="fa fa-power-off" style="cursor:pointer"></i></a></li>
11 11 </ul>
12 12 </div>
13 13 <div class="btn-group pull-right mar-top17 visible-sm visible-md">
... ... @@ -56,7 +56,7 @@
56 56  
57 57 <!-- navigation -->
58 58 <div class="clearfix"></div>
59   -<div class="row">
  59 +<div class="row" style="margin-right: auto;">
60 60 <router-outlet (activate)="changeOfRoutes()">
61 61 <modal-confirm></modal-confirm>
62 62 </router-outlet>
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4 *ngIf="license.LicenseId == 0">Add New License</h4>
... ... @@ -23,7 +23,7 @@
23 23  
24 24 <div class="container-fluid main-full">
25 25  
26   - <form class="row" [formGroup]="insertUpdateLicenseFrm" (submit)="InsertUpdateLicense(templatesuccess)">
  26 + <form class="row" [formGroup]="insertUpdateLicenseFrm" (submit)="InsertUpdateLicense(templatesuccess)" style="margin-left:-15px;margin-right:-44px">
27 27  
28 28 <div class="well marginBtm12" id="addlicenseDiv">
29 29  
... ... @@ -34,7 +34,7 @@
34 34 </div>
35 35 </div>
36 36  
37   - <div class="row">
  37 + <div class="row" style="margin-right:-10px">
38 38  
39 39 <div class="col-sm-8">
40 40  
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
1   -import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef } from '@angular/core';
  1 +import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, Pipe, PipeTransform,HostListener, TemplateRef } from '@angular/core';
2 2 import { LicenseService } from './license.service';
3 3 import { GlobalService } from '../../shared/global';
4 4 import { Router, ActivatedRoute } from '@angular/router';
... ... @@ -104,14 +104,6 @@ export class AddLicense implements OnInit {
104 104 isActive: ['false']
105 105 });
106 106  
107   - var $ua = navigator.userAgent;
108   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
109   - $('#addlicenseDiv').css('height','920px')
110   - }
111   - else
112   - {
113   - $('#addlicenseDiv').css('height','840px')
114   - }
115 107 this.GetLicenseType();
116 108 this.GetCountry();
117 109 this.GetState();
... ... @@ -145,6 +137,7 @@ export class AddLicense implements OnInit {
145 137 }
146 138 });
147 139 }, error => this.error = <any>error);
  140 +
148 141 }
149 142 public ClearWhitespaceValidator(control: FormControl) {
150 143 // clear white space
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4>View/Update Profile</h4>
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4>Manage Modesty Settings</h4>
... ... @@ -35,7 +35,7 @@
35 35  
36 36 <div class="container-fluid main-full">
37 37  
38   - <div class="row">
  38 + <div class="row" style="margin-right:-40px">
39 39 <div class="well no-margin-btm">
40 40 <div class="row">
41 41 <div class="col-lg-4 col-sm-6">
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodulesettings.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4>Manage Module</h4>
... ... @@ -22,7 +22,7 @@
22 22  
23 23 <div class="container-fluid main-full">
24 24  
25   - <div class="row">
  25 + <div class="row" style="margin-right:-40px">
26 26  
27 27 <div class="well no-margin-btm">
28 28 <div class="row">
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4 <h4>Search License</h4>
... ... @@ -39,7 +39,7 @@
39 39  
40 40 <div class="container-fluid main-full">
41 41  
42   - <form class="row" [formGroup]="searchLicenseFrm" (submit)="SearchRecords()">
  42 + <form class="row" [formGroup]="searchLicenseFrm" (submit)="SearchRecords()" style="margin-left:-15px;margin-right:-40px">
43 43  
44 44 <div class="well no-margin-btm">
45 45  
... ... @@ -217,30 +217,29 @@
217 217  
218 218 </div>
219 219  
220   - <div class="well">
  220 + <div class="well" style="padding-left:1px;">
221 221 <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable" style="width: 4032px;">
222   - <thead>
223   -
  222 + <thead>
224 223 <tr>
225   - <th style="width: 150px">Account No.</th>
226   - <th style="width: 150px">Licensee Name</th>
227   - <th style="width: 150px">License Type</th>
228   - <th style="width: 150px">Account Type</th>
229   - <th style="width: 150px">Institution Name</th>
230   - <th style="width: 150px">Address</th>
231   - <th style="width: 150px">State (Only U.S.)</th>
232   - <th style="width: 150px">Country</th>
233   - <th style="width: 150px">Email ID</th>
234   - <th style="width: 200px">Subscription Start Date</th>
235   - <th style="width: 200px">Subscription Renewal Date</th>
236   - <th style="width: 200px">Subscription End Date</th>
237   - <th style="width: 150px">Status</th>
238   - <th style="width: 200px">Original Entry Date</th>
239   - <th style="width: 200px">Last Modified Date</th>
240   - <th style="width: 200px">No. of Export Images</th>
241   - <th style="width: 150px">Admin</th>
242   - <th style="width: 150px">Credit Card No.</th>
243   - <th style="width: 150px">Product Key</th>
  224 + <th id="AccountNumber">Account No.</th>
  225 + <th id="LicenseeName" >Licensee Name</th>
  226 + <th id="LicenseTypeName">License Type</th>
  227 + <th id="AccountTypeName">Account Type</th>
  228 + <th id="InstitutionName">Institution Name</th>
  229 + <th id="Address">Address</th>
  230 + <th id="LicenseState">State (Only U.S.)</th>
  231 + <th id="LicenseCountry">Country</th>
  232 + <th id="EmailId">Email ID</th>
  233 + <th id="SubscriptionStartDate">Subscription Start Date</th>
  234 + <th id="RenewDate">Subscription Renewal Date</th>
  235 + <th id="SubscriptionEndDate">Subscription End Date</th>
  236 + <th id="LicStatus">Status</th>
  237 + <th id="EntryDate">Original Entry Date</th>
  238 + <th id="ModifyDate">Last Modified Date</th>
  239 + <th id="NoOfImages">No. of Export Images</th>
  240 + <th id="ClientAdmin">Admin</th>
  241 + <th id="CardNumber">Credit Card No.</th>
  242 + <th id="ProductKey">Product Key</th>
244 243 </tr>
245 244 </thead>
246 245 <tbody>
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts
... ... @@ -56,6 +56,8 @@ export class SearchLicense implements OnInit, AfterViewChecked {
56 56 // Declare height and width variables
57 57 scrHeight:any;
58 58 scrWidth:any;
  59 + fieldName:string;
  60 + sortType:string;
59 61 @HostListener('window:resize', ['$event'])
60 62 getScreenSize(event?) {
61 63  
... ... @@ -65,8 +67,10 @@ export class SearchLicense implements OnInit, AfterViewChecked {
65 67 }
66 68 else
67 69 {
68   - this.scrHeight = window.innerHeight-475;
  70 + this.scrHeight = window.innerHeight-460;
69 71 }
  72 +
  73 + // $(".ft_container").css("height",this.scrHeight)
70 74 }
71 75 constructor(private licenseService: LicenseService, private router: Router,
72 76 private activeRoute: ActivatedRoute, private fb: FormBuilder,
... ... @@ -167,6 +171,23 @@ export class SearchLicense implements OnInit, AfterViewChecked {
167 171 testScript.setAttribute("type", "text/javascript");
168 172 document.body.appendChild(testScript);
169 173 }
  174 +
  175 + // $("#fixed_hdr2 thead tr th").unbind("click");
  176 + // $(".ft_rwrapper table thead tr th").on("click",function(event){
  177 +
  178 + // this.fieldName=event.currentTarget.id;
  179 + // var isAscSort = $(".ft_rwrapper table thead tr #"+this.fieldName).hasClass('fx_sort_asc');
  180 + // $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  181 +
  182 + // if (isAscSort) {
  183 + // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  184 + // this.sortType="desc";
  185 + // } else {
  186 + // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  187 + // this.sortType="asc";
  188 + // }
  189 +
  190 + // });
170 191  
171 192 }
172 193  
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4>Add Building Level Account</h4>
... ... @@ -37,7 +37,7 @@
37 37 <div class="col-sm-12">
38 38  
39 39 <div class="container-fluid main-full">
40   - <div class="row">
  40 + <div class="row" style="margin-right:-40px">
41 41 <div class="well no-margin-btm" [style.visibility]="(mode == 'Search') ? 'visible' : 'hidden'">
42 42 <div class="row">
43 43 <div class="col-lg-4 col-sm-7 padd-right0">
... ...
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4 <h4>{{Mode}} Discount Code</h4>
... ... @@ -26,7 +26,7 @@
26 26 <!-- form -->
27 27 <form class="form" [formGroup]="manageDiscountCodeFrm">
28 28  
29   - <div [style.display]="(Mode == 'Manage') ? 'block' : 'none'" class="row">
  29 + <div [style.display]="(Mode == 'Manage') ? 'block' : 'none'" class="row" style="margin-right:-40px;margin-left:-30px">
30 30 <div class="well no-margin-btm">
31 31  
32 32 <div class="row">
... ...
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.ts
... ... @@ -64,7 +64,7 @@ getScreenSize(event?) {
64 64 }
65 65 else
66 66 {
67   - this.scrHeight = window.innerHeight-365;
  67 + this.scrHeight = window.innerHeight-350;
68 68 }
69 69 }
70 70  
... ...
400-SOURCECODE/Admin/src/app/components/Reports/customersummaryreport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Customer Summary Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm">
10 10 <div class="row" [formGroup]="CustomerSummaryReportForm">
11 11 <div class="col-lg-4 col-sm-4">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Discount Code Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm" [formGroup]="DiscountCodeReportForm">
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html
... ... @@ -3,14 +3,14 @@
3 3 font-size: 12px;
4 4 }
5 5 </style>
6   -<div class="row">
  6 +<div class="row" style="margin-right: auto;">
7 7 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
8 8 <h4>Expiring Subscription Report</h4>
9 9 </div>
10 10 <div class="col-sm-12">
11 11  
12 12 <div class="container-fluid main-full">
13   - <div class="row">
  13 + <div class="row" style="margin-right:-40px">
14 14 <div class="well no-margin-btm">
15 15 <div class="col-xs-12" *ngIf="alerts !== ''">
16 16 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Image Export Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm" >
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Net AD Subscription Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm">
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Site License Usage Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm">
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ... @@ -76,8 +76,8 @@
76 76 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
77 77 <select class="form-control input-sm" id="LoginTypeId" formControlName="iLoginTypeId">
78 78 <option selected="selected" value="0">All</option>
79   - <option value="1">Site License Usage</option>
80   - <option value="2">CA Link Usage</option>
  79 + <option value="1">Site License Report</option>
  80 + <option value="2">Embed URL Report</option>
81 81 </select>
82 82 </div>
83 83 </div>
... ...
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
... ... @@ -62,11 +62,11 @@ export class SiteLicenseUsageReport implements OnInit {
62 62  
63 63 var $ua = navigator.userAgent;
64 64 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
65   - this.scrHeight = window.innerHeight-470;
  65 + this.scrHeight = window.innerHeight-500;
66 66 }
67 67 else
68 68 {
69   - this.scrHeight = window.innerHeight-400;
  69 + this.scrHeight = window.innerHeight-430;
70 70 }
71 71 }
72 72 constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
... ...
400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>Subscription Cancellation Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px" >
9 9 <div class="well no-margin-btm">
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4>New Subscription Report</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6  
7 7 <div class="container-fluid main-full">
8   - <div class="row">
  8 + <div class="row" style="margin-right:-40px">
9 9 <div class="well no-margin-btm">
10 10 <div class="col-xs-12" *ngIf="alerts !== ''">
11 11 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.html
... ... @@ -3,14 +3,14 @@
3 3 font-size: 12px;
4 4 }
5 5 </style>
6   -<div class="row">
  6 +<div class="row" style="margin-right: auto;">
7 7 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
8 8 <h4>Usage Report</h4>
9 9 </div>
10 10 <div class="col-sm-12">
11 11  
12 12 <div class="container-fluid main-full">
13   - <div class="row">
  13 + <div class="row" style="margin-right:-40px">
14 14 <div class="well no-margin-btm">
15 15 <div class="col-xs-12" *ngIf="alerts !== ''">
16 16 <div class="alert alert-danger" [innerHTML]="alerts">
... ...
400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4  
... ... @@ -43,7 +43,7 @@
43 43 <div class="container-fluid main-full">
44 44 <!-- form -->
45 45 <form class="form" [formGroup]="subscriptionPriceFrm" (submit)="UpdateSubscriptionPrices(templatesuccess)">
46   - <div [style.display]="(Mode == 'Search') ? 'block' : 'none'" class="row">
  46 + <div [style.display]="(Mode == 'Search') ? 'block' : 'none'" class="row" style="margin-right:-40px;margin-left:-30px">
47 47  
48 48 <div class="well marginBtm12">
49 49 <div class="form-group" *ngIf="alerts != ''">
... ...
400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.ts
... ... @@ -53,7 +53,7 @@ getScreenSize(event?) {
53 53 }
54 54 else
55 55 {
56   - this.scrHeight = window.innerHeight-350;
  56 + this.scrHeight = window.innerHeight-330;
57 57 }
58 58 }
59 59  
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4 <h4> Change User ID</h4>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserpassword.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4 <h4> Change Password</h4>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/unblockuser.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4> Unblock User</h4>
4 4 </div>
... ... @@ -34,7 +34,7 @@
34 34 <div class="col-sm-12">
35 35  
36 36 <div class="container-fluid main-full">
37   - <div class="row">
  37 + <div class="row" style="margin-right:-40px">
38 38 <div class="well marginBtm12" novalidate [formGroup]="UnBlockedUserFrm">
39 39 <!--first-table-->
40 40 <div class="table-responsive blue">
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/updateuserprofile.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <!-- main-heading -->
3 3 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
4 4 <h4> Update Profile</h4>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/usergroup.component.html
1 1 <!-- main-heading -->
2   -<div class="row">
  2 +<div class="row" style="margin-right: auto;">
3 3  
4 4 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
5 5 <h4> {{modalTitle}}</h4>
... ... @@ -37,7 +37,7 @@
37 37 <div class="col-sm-12">
38 38  
39 39 <div class="container-fluid main-full">
40   - <div class="row" [style.visibility]="(mode == 'Search') ? 'visible' : 'hidden'">
  40 + <div class="row" [style.visibility]="(mode == 'Search') ? 'visible' : 'hidden'" style="margin-right:-40px">
41 41 <div class="well no-margin-btm">
42 42 <div class="row">
43 43 <div class="form-group" *ngIf="alerts != ''">
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
1   -<div class="row">
  1 +<div class="row" style="margin-right: auto;">
2 2 <div class="col-sm-12 pageHeading" style="margin-left: 15px;">
3 3 <h4> {{modalTitle}}</h4>
4 4 </div>
5 5 <div class="col-sm-12">
6 6 <div [className]="divClass">
7 7 <div class="container-fluid main-full">
8   - <form [formGroup]="Users">
  8 + <form [formGroup]="Users" id="searchform">
9 9 <div [style.visibility]="(Mode == 'Manage') ? 'visible' : 'hidden'" class="row">
10 10 <div class="row">
11 11 <div class="well no-margin-btm">
... ... @@ -83,7 +83,7 @@
83 83  
84 84 <div class="col-sm-12">
85 85 <div class="form-group marginTop5">
86   - <label for="LoginStatus" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Logged-In Status :</label>
  86 + <label for="LoginStatus" class="col-sm-10 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Logged-In Status :</label>
87 87 <div>
88 88 <input type="checkbox" class="radio-inline" style="height: 25px;width: 20px" id="LoginStatus" formControlName="LoginStatus">
89 89 </div>
... ... @@ -114,22 +114,22 @@
114 114 </div>
115 115  
116 116 <div class="well">
117   - <table id="fixed_hdr2" class="table-hover ">
  117 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
118 118 <thead>
119 119 <tr>
120   - <th>First Name</th>
121   - <th>Last Name</th>
122   - <th>User ID</th>
123   - <th>Password</th>
124   - <th>Email ID</th>
125   - <th>User Type</th>
126   - <th>Created Date</th>
127   - <th>Modified Date</th>
128   - <th>Account Number</th>
129   - <th>Product Edition</th>
130   - <th>User Status</th>
131   - <th>Lic. Status</th>
132   - <th>Login Status</th>
  120 + <th id="FirstName" >First Name</th>
  121 + <th id="LastName">Last Name</th>
  122 + <th id="LoginId">User ID</th>
  123 + <th id="Password">Password</th>
  124 + <th id="EmailId">Email ID</th>
  125 + <th id="UserTypeTitle">User Type</th>
  126 + <th id="CreationDate">Created Date</th>
  127 + <th id="ModifiedDate">Modified Date</th>
  128 + <th id="AccountNumber">Account Number</th>
  129 + <th id="EditionType">Product Edition</th>
  130 + <th id="UserStatus">User Status</th>
  131 + <th id="LicenseStatus">Lic. Status</th>
  132 + <th id="LoginStatus">Login Status</th>
133 133 </tr>
134 134 </thead>
135 135  
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
... ... @@ -24,9 +24,9 @@ import { PagerComponent } from &#39;../../shared/pager/pager.component&#39;;
24 24 })
25 25  
26 26 export class UsersList implements OnInit, AfterViewChecked {
27   - ngAfterViewChecked(): void {
28   - $('#fixed_hdr2 thead').css('width', $('#fixed_hdr2 tbody tr:eq(0)').width());
29   - }
  27 + ngAfterViewChecked(): void {
  28 + $('#fixed_hdr2 thead').css('width', $('#fixed_hdr2 tbody tr:eq(0)').width());
  29 + }
30 30  
31 31 Mode: string = 'Manage';
32 32 modalTitle: string;
... ... @@ -75,12 +75,15 @@ export class UsersList implements OnInit, AfterViewChecked {
75 75  
76 76 var $ua = navigator.userAgent;
77 77 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
78   - this.scrHeight = window.innerHeight-540;
  78 + this.scrHeight = window.innerHeight-500;
79 79 }
80 80 else
81 81 {
82   - this.scrHeight = window.innerHeight-440;
  82 + this.scrHeight = window.innerHeight-420;
  83 +
83 84 }
  85 +
  86 + // $(".ft_container").css("height",this.scrHeight);
84 87 }
85 88 constructor(private _loadingService: LoadingService,private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http,
86 89 private _confirmService: ConfirmService, public global:GlobalService
... ... @@ -153,7 +156,7 @@ export class UsersList implements OnInit, AfterViewChecked {
153 156 width: "100%",
154 157 height: this.scrHeight,
155 158 colModal: [
156   - { width: 180, align: 'center' },
  159 + { width: 160, align: 'center' },
157 160 { width: 160, align: 'center' },
158 161 { width: 130, align: 'Center' },
159 162 { width: 120, align: 'Center' },
... ... @@ -179,7 +182,24 @@ export class UsersList implements OnInit, AfterViewChecked {
179 182 testScript.setAttribute("type", "text/javascript");
180 183 document.body.appendChild(testScript);
181 184 }
182   -
  185 +
  186 + // $(".ft_rwrapper table thead tr th").on("click",function(event){
  187 +
  188 + // this.fieldName=event.currentTarget.id;
  189 + // var isAscSort = $(".ft_rwrapper table thead tr #"+this.fieldName).hasClass('fx_sort_asc');
  190 + // $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  191 +
  192 + // if (isAscSort) {
  193 + // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  194 + // this.sortType="desc";
  195 + // } else {
  196 + // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  197 + // this.sortType="asc";
  198 + // }
  199 +
  200 + // });
  201 +
  202 +
183 203 }
184 204 public noWhitespaceValidator(control: FormControl) {
185 205 // new validation for intial whaite space
... ... @@ -247,20 +267,9 @@ export class UsersList implements OnInit, AfterViewChecked {
247 267 }
248 268 else{
249 269 this.logoutUserSession = null;
250   - }
251   -
252   -
253   - }
254   - public SetClickedRowManageRight(j: number, item: any) {
255   -
256   -
257   - this.selectedRow = j;
258   - this.selectedId = item['Id'];
259   - this.UserManageRightsList = item;
260   - //this.buttonStatus = true;
261   -
262   -
  270 + }
263 271 }
  272 +
264 273 redirect() {
265 274 this.router.navigate(['/']);
266 275 }
... ... @@ -327,11 +336,12 @@ export class UsersList implements OnInit, AfterViewChecked {
327 336 }
328 337 }
329 338 CancelEditUser() {
  339 + $("#searchform").css("display","block");
330 340 this.SearchUserList(this.pageNo +','+ this.pageLength);
331 341 this.Mode = 'Manage';
332 342 this.modalTitle = 'LIST USER';
333 343 this.topPos = '2000px';
334   - this.divClass = 'col-sm-12';
  344 + this.divClass = '';
335 345 this.selectedRow = -1;
336 346 this.EditbuttonStatus=undefined;
337 347 this.buttonStatus=undefined;
... ... @@ -339,7 +349,7 @@ export class UsersList implements OnInit, AfterViewChecked {
339 349 }
340 350 EditUser() {
341 351 if (this.EditbuttonStatus) {
342   -
  352 + $("#searchform").css("display","none");
343 353 this.Mode = 'Edit';
344 354 this.modalTitle = 'Edit USER';
345 355 this.topPos = '100px';
... ... @@ -383,6 +393,7 @@ export class UsersList implements OnInit, AfterViewChecked {
383 393 }
384 394 EditManageUserRights() {
385 395 if (this.buttonStatus) {
  396 + $("#searchform").css("display","none");
386 397 this.Mode = 'ManageRight';
387 398 this.modalTitle = 'MANAGE USER Right';
388 399 this.topPos = '100px';
... ... @@ -391,9 +402,9 @@ export class UsersList implements OnInit, AfterViewChecked {
391 402 this.managerightFrm.controls['id'].setValue(this.UserEntity.Id);
392 403 this.managerightFrm.controls['UserTypeTitle'].setValue(this.UserEntity.UserTypeTitle);
393 404 this.GetUserRights();
394   - }
  405 +
395 406  
396   - //this.managerightFrm.contains['UserId'].setValue(this.UserEntity.Id);
  407 + }
397 408  
398 409 }
399 410 ForceLogoutUser(){
... ... @@ -448,6 +459,7 @@ export class UsersList implements OnInit, AfterViewChecked {
448 459  
449 460  
450 461 if (this.adduserFrm.valid && this.alerts == '') {
  462 + this._loadingService.ShowLoading("global-loading");
451 463 this.adduserFrm.controls['isActive'].setValue(this.adduserFrm.value.UserStatusActive) ;
452 464  
453 465 var Userobj = this.adduserFrm.value;
... ... @@ -456,6 +468,7 @@ export class UsersList implements OnInit, AfterViewChecked {
456 468 .subscribe(
457 469 n => (this.AfterInsertData(n)),
458 470 error => {
  471 + this._loadingService.HideLoading("global-loading");
459 472 this.error = <any>error;
460 473 this.alerts = "<span>" + this.error + "</span>";
461 474 });
... ... @@ -483,10 +496,12 @@ export class UsersList implements OnInit, AfterViewChecked {
483 496 var UncheckedRights = (this.UncheckedRecords.filter(C => C > 0))
484 497 if (this.managerightFrm.value.UserTypeTitle ='General Admin') {
485 498 if (this.managerightFrm.controls['checkedRecords'].value.length > 0 || this.managerightFrm.controls['UncheckedRecords'].value.length>0) {
  499 + this._loadingService.ShowLoading("global-loading");
486 500 return this.userservice.UpdateManageUserRights(UserManageRightEntity, SelectedRights, UncheckedRights)
487 501 .subscribe(
488 502 n => (this.AfterInsertDataManageRight(n)),
489 503 error => {
  504 + this._loadingService.HideLoading("global-loading");
490 505 this.error = <any>error;
491 506 this.alerts = "<span>" + this.error + "</span>";
492 507 });
... ... @@ -505,6 +520,7 @@ export class UsersList implements OnInit, AfterViewChecked {
505 520 this.alerts = '';
506 521 this.UserEntity = this.adduserFrm.value;
507 522 this._confirmService.activate("User updated successfully.", "alertMsg");
  523 + this._loadingService.HideLoading("global-loading");
508 524 }
509 525 else {
510 526 this.alerts ='We have encountered a technical error and same has been notified to our technical team.'
... ... @@ -519,6 +535,7 @@ export class UsersList implements OnInit, AfterViewChecked {
519 535 this.checkedRecords = new Array<number>(this.UserManageRightsList.length);
520 536 this.UncheckedRecords = new Array<number>(this.UserManageRightsList.length);
521 537 }
  538 + this._loadingService.HideLoading("global-loading");
522 539  
523 540 }
524 541 ResetFormFields() {
... ... @@ -530,11 +547,12 @@ export class UsersList implements OnInit, AfterViewChecked {
530 547 this.alerts = '';
531 548 }
532 549 CancelAddEdit() {
  550 + $("#searchform").css("display","block");
533 551 this.topPos = '2000px';
534 552 this.Mode = 'Manage';
535 553 this.modalTitle = 'LIST USER';
536   - this.divClass = 'col-sm-12';
  554 + this.divClass = '';
537 555  
538 556 }
539   -
  557 +
540 558 }
... ...
400-SOURCECODE/Admin/src/assets/scripts/sortable_table.js 0 โ†’ 100644
  1 +/*
  2 + SortTable
  3 + version 2
  4 + 7th April 2007
  5 + Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
  6 +
  7 + Instructions:
  8 + Download this file
  9 + Add <script src="sorttable.js"></script> to your HTML
  10 + Add class="sortable" to any table you'd like to make sortable
  11 + Click on the headers to sort
  12 +
  13 + Thanks to many, many people for contributions and suggestions.
  14 + Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
  15 + This basically means: do what you want with it.
  16 +*/
  17 +
  18 +
  19 +var stIsIE = /*@cc_on!@*/false;
  20 +
  21 +sorttable = {
  22 + DATE_RE: /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/,
  23 + init: function() {
  24 + // quit if this function has already been called
  25 + if (arguments.callee.done) return;
  26 + // flag this function so we don't do the same thing twice
  27 + arguments.callee.done = true;
  28 + // kill the timer
  29 + if (_timer) clearInterval(_timer);
  30 +
  31 + if (!document.createElement || !document.getElementsByTagName) return;
  32 +
  33 + forEach(document.getElementsByTagName('table'), function(table) {
  34 + if (table.className.search(/\bsortable\b/) != -1) {
  35 + sorttable.makeSortable(table);
  36 + }
  37 + });
  38 +
  39 + },
  40 +
  41 + makeSortable: function(table) {
  42 + if (table.getElementsByTagName('thead').length == 0) {
  43 + // table doesn't have a tHead. Since it should have, create one and
  44 + // put the first table row in it.
  45 + the = document.createElement('thead');
  46 + the.appendChild(table.rows[0]);
  47 + table.insertBefore(the,table.firstChild);
  48 + }
  49 + // Safari doesn't support table.tHead, sigh
  50 + if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
  51 +
  52 + if (table.tHead.rows.length != 1) return; // can't cope with two header rows
  53 +
  54 + // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
  55 + // "total" rows, for example). This is B&R, since what you're supposed
  56 + // to do is put them in a tfoot. So, if there are sortbottom rows,
  57 + // for backwards compatibility, move them to tfoot (creating it if needed).
  58 + sortbottomrows = [];
  59 + for (var i=0; i<table.rows.length; i++) {
  60 + if (table.rows[i].className.search(/\bsortbottom\b/) != -1) {
  61 + sortbottomrows[sortbottomrows.length] = table.rows[i];
  62 + }
  63 + }
  64 + if (sortbottomrows) {
  65 + if (table.tFoot == null) {
  66 + // table doesn't have a tfoot. Create one.
  67 + tfo = document.createElement('tfoot');
  68 + table.appendChild(tfo);
  69 + }
  70 + for (var i=0; i<sortbottomrows.length; i++) {
  71 + tfo.appendChild(sortbottomrows[i]);
  72 + }
  73 + delete sortbottomrows;
  74 + }
  75 +
  76 + // work through each column and calculate its type
  77 + headrow = table.tHead.rows[0].cells;
  78 + for (var i=0; i<headrow.length; i++) {
  79 + // manually override the type with a sorttable_type attribute
  80 + if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
  81 + mtch = headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/);
  82 + if (mtch) { override = mtch[1]; }
  83 + if (mtch && typeof sorttable["sort_"+override] == 'function') {
  84 + headrow[i].sorttable_sortfunction = sorttable["sort_"+override];
  85 + } else {
  86 + headrow[i].sorttable_sortfunction = sorttable.guessType(table,i);
  87 + }
  88 + // make it clickable to sort
  89 + headrow[i].sorttable_columnindex = i;
  90 + headrow[i].sorttable_tbody = table.tBodies[0];
  91 + dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) {
  92 +
  93 + if (this.className.search(/\bsorttable_sorted\b/) != -1) {
  94 + // if we're already sorted by this column, just
  95 + // reverse the table, which is quicker
  96 + sorttable.reverse(this.sorttable_tbody);
  97 + this.className = this.className.replace('sorttable_sorted',
  98 + 'sorttable_sorted_reverse');
  99 + this.removeChild(document.getElementById('sorttable_sortfwdind'));
  100 + sortrevind = document.createElement('span');
  101 + sortrevind.id = "sorttable_sortrevind";
  102 + sortrevind.innerHTML = stIsIE ? '&nbsp<font face="webdings">5</font>' : '&nbsp;&#x25B4;';
  103 + this.appendChild(sortrevind);
  104 + return;
  105 + }
  106 + if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) {
  107 + // if we're already sorted by this column in reverse, just
  108 + // re-reverse the table, which is quicker
  109 + sorttable.reverse(this.sorttable_tbody);
  110 + this.className = this.className.replace('sorttable_sorted_reverse',
  111 + 'sorttable_sorted');
  112 + this.removeChild(document.getElementById('sorttable_sortrevind'));
  113 + sortfwdind = document.createElement('span');
  114 + sortfwdind.id = "sorttable_sortfwdind";
  115 + sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
  116 + this.appendChild(sortfwdind);
  117 + return;
  118 + }
  119 +
  120 + // remove sorttable_sorted classes
  121 + theadrow = this.parentNode;
  122 + forEach(theadrow.childNodes, function(cell) {
  123 + if (cell.nodeType == 1) { // an element
  124 + cell.className = cell.className.replace('sorttable_sorted_reverse','');
  125 + cell.className = cell.className.replace('sorttable_sorted','');
  126 + }
  127 + });
  128 + sortfwdind = document.getElementById('sorttable_sortfwdind');
  129 + if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); }
  130 + sortrevind = document.getElementById('sorttable_sortrevind');
  131 + if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); }
  132 +
  133 + this.className += ' sorttable_sorted';
  134 + sortfwdind = document.createElement('span');
  135 + sortfwdind.id = "sorttable_sortfwdind";
  136 + sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
  137 + this.appendChild(sortfwdind);
  138 +
  139 + // build an array to sort. This is a Schwartzian transform thing,
  140 + // i.e., we "decorate" each row with the actual sort key,
  141 + // sort based on the sort keys, and then put the rows back in order
  142 + // which is a lot faster because you only do getInnerText once per row
  143 + row_array = [];
  144 + col = this.sorttable_columnindex;
  145 + rows = this.sorttable_tbody.rows;
  146 + for (var j=0; j<rows.length; j++) {
  147 + row_array[row_array.length] = [sorttable.getInnerText(rows[j].cells[col]), rows[j]];
  148 + }
  149 + /* If you want a stable sort, uncomment the following line */
  150 + //sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
  151 + /* and comment out this one */
  152 + row_array.sort(this.sorttable_sortfunction);
  153 +
  154 + tb = this.sorttable_tbody;
  155 + for (var j=0; j<row_array.length; j++) {
  156 + tb.appendChild(row_array[j][1]);
  157 + }
  158 +
  159 + delete row_array;
  160 + });
  161 + }
  162 + }
  163 + },
  164 +
  165 + guessType: function(table, column) {
  166 + // guess the type of a column based on its first non-blank row
  167 + sortfn = sorttable.sort_alpha;
  168 + for (var i=0; i<table.tBodies[0].rows.length; i++) {
  169 + text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
  170 + if (text != '') {
  171 + if (text.match(/^-?[๏ฟฝ$๏ฟฝ]?[\d,.]+%?$/)) {
  172 + return sorttable.sort_numeric;
  173 + }
  174 + // check for a date: dd/mm/yyyy or dd/mm/yy
  175 + // can have / or . or - as separator
  176 + // can be mm/dd as well
  177 + possdate = text.match(sorttable.DATE_RE)
  178 + if (possdate) {
  179 + // looks like a date
  180 + first = parseInt(possdate[1]);
  181 + second = parseInt(possdate[2]);
  182 + if (first > 12) {
  183 + // definitely dd/mm
  184 + return sorttable.sort_ddmm;
  185 + } else if (second > 12) {
  186 + return sorttable.sort_mmdd;
  187 + } else {
  188 + // looks like a date, but we can't tell which, so assume
  189 + // that it's dd/mm (English imperialism!) and keep looking
  190 + sortfn = sorttable.sort_ddmm;
  191 + }
  192 + }
  193 + }
  194 + }
  195 + return sortfn;
  196 + },
  197 +
  198 + getInnerText: function(node) {
  199 + // gets the text we want to use for sorting for a cell.
  200 + // strips leading and trailing whitespace.
  201 + // this is *not* a generic getInnerText function; it's special to sorttable.
  202 + // for example, you can override the cell text with a customkey attribute.
  203 + // it also gets .value for <input> fields.
  204 +
  205 + if (!node) return "";
  206 +
  207 + hasInputs = (typeof node.getElementsByTagName == 'function') &&
  208 + node.getElementsByTagName('input').length;
  209 +
  210 + if (node.getAttribute("sorttable_customkey") != null) {
  211 + return node.getAttribute("sorttable_customkey");
  212 + }
  213 + else if (typeof node.textContent != 'undefined' && !hasInputs) {
  214 + return node.textContent.replace(/^\s+|\s+$/g, '');
  215 + }
  216 + else if (typeof node.innerText != 'undefined' && !hasInputs) {
  217 + return node.innerText.replace(/^\s+|\s+$/g, '');
  218 + }
  219 + else if (typeof node.text != 'undefined' && !hasInputs) {
  220 + return node.text.replace(/^\s+|\s+$/g, '');
  221 + }
  222 + else {
  223 + switch (node.nodeType) {
  224 + case 3:
  225 + if (node.nodeName.toLowerCase() == 'input') {
  226 + return node.value.replace(/^\s+|\s+$/g, '');
  227 + }
  228 + case 4:
  229 + return node.nodeValue.replace(/^\s+|\s+$/g, '');
  230 + break;
  231 + case 1:
  232 + case 11:
  233 + var innerText = '';
  234 + for (var i = 0; i < node.childNodes.length; i++) {
  235 + innerText += sorttable.getInnerText(node.childNodes[i]);
  236 + }
  237 + return innerText.replace(/^\s+|\s+$/g, '');
  238 + break;
  239 + default:
  240 + return '';
  241 + }
  242 + }
  243 + },
  244 +
  245 + reverse: function(tbody) {
  246 + // reverse the rows in a tbody
  247 + newrows = [];
  248 + for (var i=0; i<tbody.rows.length; i++) {
  249 + newrows[newrows.length] = tbody.rows[i];
  250 + }
  251 + for (var i=newrows.length-1; i>=0; i--) {
  252 + tbody.appendChild(newrows[i]);
  253 + }
  254 + delete newrows;
  255 + },
  256 +
  257 + /* sort functions
  258 + each sort function takes two parameters, a and b
  259 + you are comparing a[0] and b[0] */
  260 + sort_numeric: function(a,b) {
  261 + aa = parseFloat(a[0].replace(/[^0-9.-]/g,''));
  262 + if (isNaN(aa)) aa = 0;
  263 + bb = parseFloat(b[0].replace(/[^0-9.-]/g,''));
  264 + if (isNaN(bb)) bb = 0;
  265 + return aa-bb;
  266 + },
  267 + sort_alpha: function(a,b) {
  268 + if (a[0]==b[0]) return 0;
  269 + if (a[0]<b[0]) return -1;
  270 + return 1;
  271 + },
  272 + sort_ddmm: function(a,b) {
  273 + mtch = a[0].match(sorttable.DATE_RE);
  274 + y = mtch[3]; m = mtch[2]; d = mtch[1];
  275 + if (m.length == 1) m = '0'+m;
  276 + if (d.length == 1) d = '0'+d;
  277 + dt1 = y+m+d;
  278 + mtch = b[0].match(sorttable.DATE_RE);
  279 + y = mtch[3]; m = mtch[2]; d = mtch[1];
  280 + if (m.length == 1) m = '0'+m;
  281 + if (d.length == 1) d = '0'+d;
  282 + dt2 = y+m+d;
  283 + if (dt1==dt2) return 0;
  284 + if (dt1<dt2) return -1;
  285 + return 1;
  286 + },
  287 + sort_mmdd: function(a,b) {
  288 + mtch = a[0].match(sorttable.DATE_RE);
  289 + y = mtch[3]; d = mtch[2]; m = mtch[1];
  290 + if (m.length == 1) m = '0'+m;
  291 + if (d.length == 1) d = '0'+d;
  292 + dt1 = y+m+d;
  293 + mtch = b[0].match(sorttable.DATE_RE);
  294 + y = mtch[3]; d = mtch[2]; m = mtch[1];
  295 + if (m.length == 1) m = '0'+m;
  296 + if (d.length == 1) d = '0'+d;
  297 + dt2 = y+m+d;
  298 + if (dt1==dt2) return 0;
  299 + if (dt1<dt2) return -1;
  300 + return 1;
  301 + },
  302 +
  303 + shaker_sort: function(list, comp_func) {
  304 + // A stable sort function to allow multi-level sorting of data
  305 + // see: http://en.wikipedia.org/wiki/Cocktail_sort
  306 + // thanks to Joseph Nahmias
  307 + var b = 0;
  308 + var t = list.length - 1;
  309 + var swap = true;
  310 +
  311 + while(swap) {
  312 + swap = false;
  313 + for(var i = b; i < t; ++i) {
  314 + if ( comp_func(list[i], list[i+1]) > 0 ) {
  315 + var q = list[i]; list[i] = list[i+1]; list[i+1] = q;
  316 + swap = true;
  317 + }
  318 + } // for
  319 + t--;
  320 +
  321 + if (!swap) break;
  322 +
  323 + for(var i = t; i > b; --i) {
  324 + if ( comp_func(list[i], list[i-1]) < 0 ) {
  325 + var q = list[i]; list[i] = list[i-1]; list[i-1] = q;
  326 + swap = true;
  327 + }
  328 + } // for
  329 + b++;
  330 +
  331 + } // while(swap)
  332 + }
  333 +}
  334 +
  335 +/* ******************************************************************
  336 + Supporting functions: bundled here to avoid depending on a library
  337 + ****************************************************************** */
  338 +
  339 +// Dean Edwards/Matthias Miller/John Resig
  340 +
  341 +/* for Mozilla/Opera9 */
  342 +if (document.addEventListener) {
  343 + document.addEventListener("DOMContentLoaded", sorttable.init, false);
  344 +}
  345 +
  346 +/* for Internet Explorer */
  347 +/*@cc_on @*/
  348 +/*@if (@_win32)
  349 + document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
  350 + var script = document.getElementById("__ie_onload");
  351 + script.onreadystatechange = function() {
  352 + if (this.readyState == "complete") {
  353 + sorttable.init(); // call the onload handler
  354 + }
  355 + };
  356 +/*@end @*/
  357 +
  358 +/* for Safari */
  359 +if (/WebKit/i.test(navigator.userAgent)) { // sniff
  360 + var _timer = setInterval(function() {
  361 + if (/loaded|complete/.test(document.readyState)) {
  362 + sorttable.init(); // call the onload handler
  363 + }
  364 + }, 10);
  365 +}
  366 +
  367 +/* for other browsers */
  368 +window.onload = sorttable.init;
  369 +
  370 +// written by Dean Edwards, 2005
  371 +// with input from Tino Zijdel, Matthias Miller, Diego Perini
  372 +
  373 +// http://dean.edwards.name/weblog/2005/10/add-event/
  374 +
  375 +function dean_addEvent(element, type, handler) {
  376 + if (element.addEventListener) {
  377 + element.addEventListener(type, handler, false);
  378 + } else {
  379 + // assign each event handler a unique ID
  380 + if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
  381 + // create a hash table of event types for the element
  382 + if (!element.events) element.events = {};
  383 + // create a hash table of event handlers for each element/event pair
  384 + var handlers = element.events[type];
  385 + if (!handlers) {
  386 + handlers = element.events[type] = {};
  387 + // store the existing event handler (if there is one)
  388 + if (element["on" + type]) {
  389 + handlers[0] = element["on" + type];
  390 + }
  391 + }
  392 + // store the event handler in the hash table
  393 + handlers[handler.$$guid] = handler;
  394 + // assign a global event handler to do all the work
  395 + element["on" + type] = handleEvent;
  396 + }
  397 +};
  398 +// a counter used to create unique IDs
  399 +dean_addEvent.guid = 1;
  400 +
  401 +function removeEvent(element, type, handler) {
  402 + if (element.removeEventListener) {
  403 + element.removeEventListener(type, handler, false);
  404 + } else {
  405 + // delete the event handler from the hash table
  406 + if (element.events && element.events[type]) {
  407 + delete element.events[type][handler.$$guid];
  408 + }
  409 + }
  410 +};
  411 +
  412 +function handleEvent(event) {
  413 + var returnValue = true;
  414 + // grab the event object (IE uses a global event object)
  415 + event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
  416 + // get a reference to the hash table of event handlers
  417 + var handlers = this.events[event.type];
  418 + // execute each event handler
  419 + for (var i in handlers) {
  420 + this.$$handleEvent = handlers[i];
  421 + if (this.$$handleEvent(event) === false) {
  422 + returnValue = false;
  423 + }
  424 + }
  425 + return returnValue;
  426 +};
  427 +
  428 +function fixEvent(event) {
  429 + // add W3C standard event methods
  430 + event.preventDefault = fixEvent.preventDefault;
  431 + event.stopPropagation = fixEvent.stopPropagation;
  432 + return event;
  433 +};
  434 +fixEvent.preventDefault = function() {
  435 + this.returnValue = false;
  436 +};
  437 +fixEvent.stopPropagation = function() {
  438 + this.cancelBubble = true;
  439 +}
  440 +
  441 +// Dean's forEach: http://dean.edwards.name/base/forEach.js
  442 +/*
  443 + forEach, version 1.0
  444 + Copyright 2006, Dean Edwards
  445 + License: http://www.opensource.org/licenses/mit-license.php
  446 +*/
  447 +
  448 +// array-like enumeration
  449 +if (!Array.forEach) { // mozilla already supports this
  450 + Array.forEach = function(array, block, context) {
  451 + for (var i = 0; i < array.length; i++) {
  452 + block.call(context, array[i], i, array);
  453 + }
  454 + };
  455 +}
  456 +
  457 +// generic enumeration
  458 +Function.prototype.forEach = function(object, block, context) {
  459 + for (var key in object) {
  460 + if (typeof this.prototype[key] == "undefined") {
  461 + block.call(context, object[key], key, object);
  462 + }
  463 + }
  464 +};
  465 +
  466 +// character enumeration
  467 +String.forEach = function(string, block, context) {
  468 + Array.forEach(string.split(""), function(chr, index) {
  469 + block.call(context, chr, index, string);
  470 + });
  471 +};
  472 +
  473 +// globally resolve forEach enumeration
  474 +var forEach = function(object, block, context) {
  475 + if (object) {
  476 + var resolve = Object; // default
  477 + if (object instanceof Function) {
  478 + // functions have a "length" property
  479 + resolve = Function;
  480 + } else if (object.forEach instanceof Function) {
  481 + // the object implements a custom forEach method so use that
  482 + object.forEach(block, context);
  483 + return;
  484 + } else if (typeof object == "string") {
  485 + // the object is a string
  486 + resolve = String;
  487 + } else if (typeof object.length == "number") {
  488 + // the object is array-like
  489 + resolve = Array;
  490 + }
  491 + resolve.forEach(object, block, context);
  492 + }
  493 +};
0 494 \ No newline at end of file
... ...
400-SOURCECODE/Admin/src/assets/styles/admin-custom.css
... ... @@ -36,7 +36,7 @@
36 36 }
37 37 }
38 38  
39   -@media (max-width: 1024px) {
  39 +@media (max-width: 1200px) {
40 40 .navbar-header {
41 41 float: none;
42 42 }
... ...
400-SOURCECODE/Admin/src/assets/styles/bootstrap-spinner.css
... ... @@ -9,7 +9,7 @@
9 9 width: 100%;
10 10 height: 100%;
11 11 background: black;
12   - opacity: 0.5;
  12 + opacity: 0.1;
13 13 filter: alpha(opacity=50);
14 14 }
15 15  
... ...
400-SOURCECODE/Admin/src/assets/styles/bootstrap.css
... ... @@ -819,7 +819,7 @@ pre code {
819 819 }
820 820 .row {
821 821 margin-left: -15px;
822   - margin-right: -15px;
  822 + margin-right: -20px;
823 823 }
824 824 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
825 825 position: relative;
... ... @@ -3442,15 +3442,6 @@ select[multiple].input-group-sm &gt; .input-group-btn &gt; .btn {
3442 3442 margin-right: -15px;
3443 3443 margin-left: -15px;
3444 3444 }
3445   -@media (min-width: 768px) {
3446   - .container > .navbar-header,
3447   - .container-fluid > .navbar-header,
3448   - .container > .navbar-collapse,
3449   - .container-fluid > .navbar-collapse {
3450   - margin-right: 0;
3451   - margin-left: 0;
3452   - }
3453   -}
3454 3445 .navbar-static-top {
3455 3446 z-index: 1000;
3456 3447 border-width: 0 0 1px;
... ... @@ -5805,7 +5796,7 @@ button.close {
5805 5796 display: inline-block !important;
5806 5797 }
5807 5798 }
5808   -@media (min-width: 768px) and (max-width: 991px) {
  5799 +@media (min-width: 400px) and (max-width: 1200px) {
5809 5800 .visible-sm {
5810 5801 display: block !important;
5811 5802 }
... ... @@ -5830,15 +5821,17 @@ button.close {
5830 5821 display: inline !important;
5831 5822 }
5832 5823 }
  5824 +
  5825 +
5833 5826 @media (min-width: 768px) and (max-width: 991px) {
5834 5827 .visible-sm-inline-block {
5835 5828 display: inline-block !important;
5836 5829 }
5837 5830 }
5838 5831 @media (min-width: 992px) and (max-width: 1199px) {
5839   - .visible-md {
  5832 + /* .visible-md {
5840 5833 display: block !important;
5841   - }
  5834 + } */
5842 5835 table.visible-md {
5843 5836 display: table !important;
5844 5837 }
... ... @@ -5900,7 +5893,7 @@ button.close {
5900 5893 display: none !important;
5901 5894 }
5902 5895 }
5903   -@media (min-width: 768px) and (max-width: 991px) {
  5896 +@media (min-width: 100px) and (max-width: 1200px) {
5904 5897 .hidden-sm {
5905 5898 display: none !important;
5906 5899 }
... ...
400-SOURCECODE/Admin/src/assets/styles/fixed_table_rc.css
1 1 .ft_container {border: 1px solid #ddd;}
2 2 .ft_container table { border-width: 0px; border-collapse: collapse; margin: 0; outline-style: none; font-size: 0.9em; background-color: #fff; }
3 3  
4   -.ft_container table tr th { font-weight: bold; background: #0095da; color: #fff; }
  4 +.ft_container table tr th { font-weight: bold; background: #7166b7; color: #fff; }
5 5  
6 6 .ft_container table thead { -moz-user-select: none;-webkit-user-select: none;}
7 7 .ft_container table tr th,
... ...
400-SOURCECODE/Admin/src/assets/styles/main.css
... ... @@ -783,22 +783,6 @@ padding-left:5px; padding-right:5px;
783 783 }
784 784  
785 785  
786   -
787   -@media (min-width: 768px) and (max-width: 1199px) {
788   -.hidden-sm {
789   - display: none !important;
790   -}
791   -.width120 {
792   - width: 90%!important;
793   -}
794   -
795   -.builder-Guide-left{ min-width:118px; width:9%; padding:0;}
796   -.builder-Guide-right{ min-width:485px; width:80%; padding:0;}
797   -.color-pallate{ position:absolute; top:5px;}
798   -
799   -/* .toggleBar { margin:20px 10px 0 0}*/
800   -}
801   -
802 786 @media (min-width: 768px) {
803 787 .toperMenu-spaceleft {
804 788 margin-left: 20px;
... ... @@ -833,4 +817,18 @@ padding-left:5px; padding-right:5px;
833 817 .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
834 818 background: #1c92d0;
835 819 color:#fff;
836   -}
837 820 \ No newline at end of file
  821 +}
  822 +
  823 +.maintable thead tr th.fx_sort_bg{ background-image: url(images/bg.gif); background-position: right center; background-repeat: no-repeat; }
  824 +.maintable thead tr th.fx_sort_bg_asc{ background-image: url(images/asc.gif); }
  825 +.maintable thead tr th.fx_sort_bg_dsc{ background-image: url(images/desc.gif); }
  826 +
  827 +.maintable thead{ background: #7166b7;position:sticky;position: -webkit-sticky;top:-1px;z-index: 2;}
  828 +.maintable thead tr th mfdefaultsorter a{ color:#fff}
  829 +.maintable > tbody > tr.active > td {
  830 + background: #726D6D;
  831 + color: #FDFBFB;
  832 + }
  833 +
  834 +
  835 +
838 836 \ No newline at end of file
... ...
400-SOURCECODE/Admin/src/index.html
... ... @@ -39,7 +39,7 @@
39 39 <script src="assets/scripts/jquery-1.11.3.min.js"></script>
40 40 <script src="assets/scripts/bootstrap.js"></script>
41 41 <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
42   - <script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script>
  42 + <script src="assets/scripts/sortable_table.js" type="text/javascript"></script>
43 43 <script src="assets/scripts/fixed_table_rc.js" type="text/javascript"></script>
44 44 <!--Nav-->
45 45 <script>
... ...