Merge branch 'AIA_QA' into AIA_PROD

Birendra Kumar
2 parents ec32b531 ef95de59
Showing 21 changed files with 339 additions and 95 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.ts
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts
@@ -94,7 +94,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
             string sStartDate = DateTime.MinValue.ToShortDateString();
             string sEndDate = DateTime.MaxValue.ToShortDateString();
             var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
-            var lstDiscountCode = dbContext.usp_GetDiscountCodes("", "", "","Id","asc", 1, 1, spRecordCount).ToList();
+            var lstDiscountCode = dbContext.usp_GetDiscountCodes("", "", "","Id","asc",false, 1, 1, spRecordCount).ToList();
             lstDiscountCode1 = lstDiscountCode.Select(l => new usp_GetDiscountCodes_Result { Id = l.Id, DiscountCode = l.DiscountCode }).ToList();
             return Ok(lstDiscountCode1);
         }
@@ -25,13 +25,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
         [Route("GetDiscountCodes")]
         [HttpGet]
-        public HttpResponseMessage GetDiscountCodes(string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength)
+        public HttpResponseMessage GetDiscountCodes(string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength,bool isGridBind)
         {
             List<usp_GetDiscountCodes_Result> DiscountCodeList;
             int recordCount = 0;
             try
             {
-                DiscountCodeList = DiscountCodeModel.GetDiscountCodes(dbContext, discountCode, startDate, endDate, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
+                DiscountCodeList = DiscountCodeModel.GetDiscountCodes(dbContext, discountCode, startDate, endDate, sortColumn, sortOrder, pageNo, pageLength,isGridBind, out recordCount);
                 return Request.CreateResponse(HttpStatusCode.OK, new { DiscountCodeList = DiscountCodeList, RecordCount = recordCount });
             }
             catch (Exception ex)
@@ -4005,7 +4005,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetCustomerSummary_Result>("usp_GetCustomerSummary", sAccoutNumberParameter, sLicenseeFullNameParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeParameter, iAccountTypeParameter, sZipParameter, iStateParameter, iCountryParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
-        public virtual ObjectResult<usp_GetDiscountCodes_Result> usp_GetDiscountCodes(string sDiscountCode, string sStartDate, string sEndDate, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
+        public virtual ObjectResult<usp_GetDiscountCodes_Result> usp_GetDiscountCodes(string sDiscountCode, string sStartDate, string sEndDate, string sortColumn, string sortOrder, Nullable<bool> isGridBind, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sDiscountCodeParameter = sDiscountCode != null ?
                 new ObjectParameter("sDiscountCode", sDiscountCode) :
@@ -4027,6 +4027,10 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("sortOrder", sortOrder) :
                 new ObjectParameter("sortOrder", typeof(string));
+            var isGridBindParameter = isGridBind.HasValue ?
+                new ObjectParameter("isGridBind", isGridBind) :
+                new ObjectParameter("isGridBind", typeof(bool));
+    
             var pageNoParameter = pageNo.HasValue ?
                 new ObjectParameter("pageNo", pageNo) :
                 new ObjectParameter("pageNo", typeof(int));
@@ -4035,7 +4039,7 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("pageLength", pageLength) :
                 new ObjectParameter("pageLength", typeof(int));
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetDiscountCodes_Result>("usp_GetDiscountCodes", sDiscountCodeParameter, sStartDateParameter, sEndDateParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetDiscountCodes_Result>("usp_GetDiscountCodes", sDiscountCodeParameter, sStartDateParameter, sEndDateParameter, sortColumnParameter, sortOrderParameter, isGridBindParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
         public virtual ObjectResult<usp_GetDiscountReport_Result> usp_GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
@@ -1004,6 +1004,7 @@
           <Parameter Name="sEndDate" Type="varchar" Mode="In" />
           <Parameter Name="sortColumn" Type="varchar" Mode="In" />
           <Parameter Name="sortOrder" Type="varchar" Mode="In" />
+          <Parameter Name="isGridBind" Type="bit" Mode="In" />
           <Parameter Name="pageNo" Type="int" Mode="In" />
           <Parameter Name="pageLength" Type="int" Mode="In" />
           <Parameter Name="recordCount" Type="int" Mode="InOut" />
@@ -2761,6 +2762,7 @@
             <Parameter Name="sEndDate" Mode="In" Type="String" />
             <Parameter Name="sortColumn" Mode="In" Type="String" />
             <Parameter Name="sortOrder" Mode="In" Type="String" />
+            <Parameter Name="isGridBind" Mode="In" Type="Boolean" />
             <Parameter Name="pageNo" Mode="In" Type="Int32" />
             <Parameter Name="pageLength" Mode="In" Type="Int32" />
             <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
@@ -15,14 +15,14 @@ namespace AIAHTML5.ADMIN.API.Models
         public bool IsActive { get; set; }
         public decimal Percentage { get; set; }
-        public static List<usp_GetDiscountCodes_Result> GetDiscountCodes(AIADatabaseV5Entities dbContext, string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
+        public static List<usp_GetDiscountCodes_Result> GetDiscountCodes(AIADatabaseV5Entities dbContext, string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength, bool isGridBind, out int recordCount)
         {
             List<usp_GetDiscountCodes_Result> DiscountCodeList = new List<usp_GetDiscountCodes_Result>();        
             var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
             recordCount = 0;
             try
             {
-                DiscountCodeList = dbContext.usp_GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy"), sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
+                DiscountCodeList = dbContext.usp_GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy"), sortColumn, sortOrder,isGridBind, pageNo, pageLength, spRecordCount).ToList();
                 recordCount = (int)spRecordCount.Value;
             }
@@ -4827,8 +4827,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                 };
                             }
+                           
+
+                            $("#termList").find("option").removeClass('currentTermActive');
+                            if(actualTermNo>0)
+                            {
+                                var TermNumber = actualTermNo+'_'+windowviewid;
+                                $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+                            }
+                          
+
                         }
-                        
+
                     }
             }
@@ -11153,6 +11163,25 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     }, 200);  
                 }                                         
+                 
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
+                var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            
+             if (actualTermNumber >0) {
+               
+                var pinData = new jinqJs()
+                            .from( $scope.limitTofilterdata)
+                            .where("_ActualTermNumber == " + actualTermNumber)
+                            .select();       
+                                           
+                if(pinData.length>0)
+                {
+                    var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
+                    $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+                                 
+             }
+
         }
         $scope.HideSearch = function () {
@@ -11361,6 +11390,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $('#btlLoadMoreLm').attr('disabled', 'disabled');
             }
+            var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            $("#termList").find("option").removeClass('currentTermActive');
+            if(actualTermNo>0)
+            {
+                var TermNumber = actualTermNo+'_'+windowviewid;
+                $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+            }
+
             $scope.EnableDAUI(windowviewid);
         }
@@ -11496,6 +11533,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                   }
               }
+
+              var actualTermNo=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+              $("#termList").find("option").removeClass('currentTermActive');
+              if(actualTermNo>0)
+              {
+                  var TermNumber = actualTermNo+'_'+windowviewid;
+                  $("#termList").find("option[id=" + TermNumber + "]").addClass('currentTermActive');
+              }
+
               $scope.EnableDAUI(windowviewid);
         }
@@ -11537,10 +11583,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $scope.SetwindowStoreData(windowviewid,'isNormalMode',false);
                 $scope.SetwindowStoreData(windowviewid,'prevId',actualTermNumber);
-                $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-                $("#termList").find("option[id=" + selectedtermid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+
+                $("#termList").find("option").removeClass('currentTermActive');
+        
+                $("#termList").find("option[id=" + selectedtermid + "]").addClass('currentTermActive');
+               
-                  var isListManagerSelected=true;
+                var isListManagerSelected=true;
                 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',isListManagerSelected);
                 //---
                 if (isListManagerSelected == true) {
@@ -12005,6 +12054,27 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
              $compile($all)($scope);
              $("#typedTermName_" + windowviewid).attr("name", "0");
+
+             
+             $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff" });
+    
+             var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
+            
+             if (actualTermNumber >0) {
+               
+                var pinData = new jinqJs()
+                            .from( $scope.limitTofilterdata)
+                            .where("_ActualTermNumber == " + actualTermNumber)
+                            .select();                      
+            
+
+                if(pinData.length>0)
+                {
+                    var pinTermNumber = pinData[0]._ActualTermNumber+'_'+windowviewid;
+                    $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+                
+             }
         };
@@ -2841,6 +2841,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         }
+                    // highlight pin on list manager
+
+                    $("#termList").find("option").removeClass('currentTermActive');
+                    var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+                    var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+                           
+                    if (activePinArray.length >0) {
+                        for (var i = 0; i < activePinArray.length; i++) {
+                            var pinnum = activePinArray[i].split("_")[1];  
+                       
+                            var pinData = new jinqJs()
+                                          .from(aaPinData)
+                                          .where("_PinId == " + pinnum)
+                                          .select();                      
+                           
+                             var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                             $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                        }
+                    }
                  }
@@ -3180,6 +3199,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $('#btlLoadMoreLm').attr('disabled', 'disabled');
         }
+        $("#termList").find("option").removeClass('currentTermActive');
+        var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+        var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+               
+        if (activePinArray.length >0) {
+            for (var i = 0; i < activePinArray.length; i++) {
+                var pinnum = activePinArray[i].split("_")[1];  
+           
+                var pinData = new jinqJs()
+                              .from(aaPinData)
+                              .where("_PinId == " + pinnum)
+                              .select();                      
+               
+                 var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                 $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+            }
+        }      
+
         $scope.EnableAAUI(windowviewid);                       
     }
@@ -3300,6 +3337,23 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $('#btlLoadMoreLm').attr('disabled', 'disabled');
             }
+            $("#termList").find("option").removeClass('currentTermActive');
+            var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+            var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+                   
+            if (activePinArray.length >0) {
+                for (var i = 0; i < activePinArray.length; i++) {
+                    var pinnum = activePinArray[i].split("_")[1];  
+               
+                    var pinData = new jinqJs()
+                                  .from(aaPinData)
+                                  .where("_PinId == " + pinnum)
+                                  .select();                      
+                   
+                     var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                     $("#termList").find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                }
+            }
         }
         $scope.EnableAAUI(windowviewid);
@@ -3574,9 +3628,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $('#termlistfilter_'+windowviewid).css("display", "block");
+            var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+
             angular.forEach($scope.limitTofilterdata, function (value2, key2) {
-                var $el = $('<option id=' +  value2._TermNumber +'_' +windowviewid+ '>' +  value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
+
+                var $el = $('<option id=' +  value2._TermNumber +'_' +windowviewid+'>' +  value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
                 $compile($el)($scope);
+               
             })
             var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
@@ -3587,8 +3645,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 $timeout(function () {
                     $('#termlistfilter_'+windowviewid).focus();
                     }, 200);  
-                }                                         
-
+                }  
+                
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
+                var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+               
+                if (activePinArray.length >0) {
+                    for (var i = 0; i < activePinArray.length; i++) {
+                        var pinnum = activePinArray[i].split("_")[1];  
+                   
+                        var pinData = new jinqJs()
+                                      .from(aaPinData)
+                                      .where("_PinId == " + pinnum)
+                                      .select();                      
+                       
+                         var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                        $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+                    }
+                }
+                 
+        
     }
     $scope.resetSearchListView = function (event) {
@@ -3673,6 +3749,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
          $compile($all)($scope);
          $("#selectedTermName_" + windowviewid).attr("name", "0");
+
+         $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
+         var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+         var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+        
+         if (activePinArray.length >0) {
+             for (var i = 0; i < activePinArray.length; i++) {
+                 var pinnum = activePinArray[i].split("_")[1];  
+            
+                 var pinData = new jinqJs()
+                               .from(aaPinData)
+                               .where("_PinId == " + pinnum)
+                               .select();                      
+                
+                  var pinTermNumber = pinData[0]._TermId+'_'+windowviewid;
+                 $('#termlistfilter_' + windowviewid).find("option[id=" + pinTermNumber + "]").addClass('currentTermActive');
+             }
+         }
     };
@@ -3774,9 +3868,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $scope.showAllPinsAfterHide(windowviewid);
-        $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-        $("#termList").find("option[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
-       
+       // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+       $("#termList").find("option").removeClass('currentTermActive');
+        $("#termList").find("option[id=" + termid + "]").addClass('currentTermActive');
+
         //get data from pindata for this trem
         var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
@@ -1538,17 +1538,10 @@ footer .browserIcons
     bottom: 0;
     width: 50%;
 }
-.labExModalbackground
+.currentTermActive
 {
-    background-color: black; 
-    bottom: 0px; 
-    display: none; 
-    height: 100%; left: 0px; 
-    opacity: 0.5;
-     position: fixed; 
-    right: 0px; top: 0px; 
-    width: 100%;
-     z-index: 12000000;
+    background-color: #206db9 !important; 
+   color:#ffffff !important;
 }
 #nameHelpBlock 
  {
@@ -1562,6 +1555,18 @@ footer .browserIcons
 {
      display:none;
 }
+.labExModalbackground
+{
+    background-color: black; 
+    bottom: 0px; 
+    display: none; 
+    height: 100%; left: 0px; 
+    opacity: 0.5;
+     position: fixed; 
+    right: 0px; top: 0px; 
+    width: 100%;
+     z-index: 12000000;
+}
 /*  ........Add paging bootstrap CSS...  Birendra 14/2/2020 */
 .pagination{margin:0px 0;}
 .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
@@ -242,7 +242,7 @@
                                 {{item.StateName}}
                               </option>
                             </select>
-                            <div *ngIf="insertUpdateLicenseFrm.get('stateId').hasError('min')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
+                            <div *ngIf="insertUpdateLicenseFrm.get('stateId').hasError('min') && insertUpdateLicenseFrm.controls.stateId.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
                           </div>
                         </div>
                       </div>
@@ -270,6 +270,7 @@
                           <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
                             <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                             <div *ngIf="insertUpdateLicenseFrm.controls.zip.hasError('required') && insertUpdateLicenseFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                            <div *ngIf="insertUpdateLicenseFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                           </div>
                         </div>
                       </div>
@@ -79,7 +79,7 @@ export class AddLicense implements OnInit {
       city: ['', [Validators.required,this.noWhitespaceValidator]],
       stateId: [0, [Validators.min(1)]],
       countryId: [0, Validators.min(1)],
-      zip: ['', [Validators.required]],
+      zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
       emailId: ['', [Validators.required]],
       //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
       phone: ['', [Validators.required]],
@@ -272,8 +272,8 @@ UpdatePhoneValidation()
     else
     {
       this.IsUniteState=false;
-     // this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9]*$')]);
-      this.PhoneNumber.setValidators([Validators.required]);
+      this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+     // this.PhoneNumber.setValidators([Validators.required]);
       this.PhoneNumber.updateValueAndValidity(); 
       this.OtherFormatPhoneNumber(phoneno);
     }
@@ -110,6 +110,7 @@
                       <div class="col-sm-7">
                         <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                         <div *ngIf="updateLicenseBasicSettingsFrm.controls.zip.hasError('required') && updateLicenseBasicSettingsFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                        <div *ngIf="updateLicenseBasicSettingsFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                       </div>
                     </div>
@@ -122,7 +123,7 @@
                             {{item.StateName}}
                           </option>
                         </select>
-                        <div *ngIf="updateLicenseBasicSettingsFrm.get('stateId').hasError('min')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
+                        <div *ngIf="updateLicenseBasicSettingsFrm.get('stateId').hasError('min') && updateLicenseBasicSettingsFrm.controls.stateId.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
                       </div>
                     </div>
@@ -56,7 +56,7 @@ export class EditLicenseBasicSettings implements OnInit {
       city: ['', [Validators.required,this.noWhitespaceValidator]],
       stateId: [0, [Validators.min(1)]],
       countryId: [0],
-      zip: ['', [Validators.required]],
+      zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
       emailId: ['', [Validators.required]],
       //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
       phone: ['', [Validators.required]]
@@ -193,8 +193,8 @@ UpdatePhoneValidation()
     else
     {
       this.IsUniteState=false;
-     // this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9]*$')]);
-      this.PhoneNumber.setValidators([Validators.required]);
+      this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+      //this.PhoneNumber.setValidators([Validators.required]);
       this.PhoneNumber.updateValueAndValidity(); 
       this.OtherFormatPhoneNumber(phoneno);
     }
@@ -310,7 +310,7 @@
                         <label for="Country" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Country <span class="red">*</span> :</label>
                       </div>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                          <select class="form-control input-sm " id="State" formControlName="countryId" (change)="OnCountryChange($event.target)">
+                          <select class="form-control input-sm " id="Country" formControlName="countryId" (change)="OnCountryChange($event.target)">
                               <option value="0">Select</option>
                               <option *ngFor="let item of lstCountry" value="{{item.Id}}">
                                   {{item.CountryName}}
@@ -324,8 +324,9 @@
                     <div class="form-group marginTop5">
                       <label for="Zip" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Zip <span class="red">*</span> : </label>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                        <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20">
+                        <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.zip.hasError('required') && insertUpdateSiteLicenseFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                        <div *ngIf="insertUpdateSiteLicenseFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                       </div>
                       </div>
                   </div>
@@ -335,9 +336,8 @@
                         <label for="Phone" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Phone <span class="red">*</span> :</label>
                         </div>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                        <input type="phone" class="form-control input-sm" id="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)">
-                        <!--<div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('required') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>-->
-                        <span class="help-block">(xxx-xxx-xxxx)</span>
+                        <input type="phone" class="form-control input-sm" id="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)" (keydown.space)="$event.preventDefault();">   
+                        <span *ngIf="IsUniteState" class="help-block">(xxx-xxx-xxxx)</span>
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('required') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('pattern') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is invalid</div>
                       </div>
@@ -56,6 +56,7 @@ export class SiteLicenseAccount implements OnInit {
 	  pageNo:1,
       pageLength:10	  
     };
+    IsUniteState:Boolean=false;
     @HostListener('window:resize', ['$event'])
     getScreenSize(event?) {
@@ -102,9 +103,10 @@ export class SiteLicenseAccount implements OnInit {
             city: ['', [Validators.required,this.noWhitespaceValidator]],
             countryId: [0, Validators.min(1)],
             stateId: [0, Validators.min(1)],
-            zip: ['', [Validators.required,this.noWhitespaceValidator]],
-            phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]],
-            //phone: ['', Validators.required],
+            zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
+            //zip: ['', [Validators.required,this.noWhitespaceValidator]],
+            //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]],
+            phone: ['', Validators.required],
             clientAdminId: [0, Validators.min(1)],
             clientAdminEmail: [{value: '', disabled: true}, this.noWhitespaceValidator],
             isActive: [0],
@@ -217,48 +219,54 @@ export class SiteLicenseAccount implements OnInit {
      }
      onKeyUp(event: any) {      
-        var mobno = event.target.value;
-        var newnum=mobno;   
-          if(mobno!="" && event.key!="Backspace")
+      var mobno = event.target.value;
+      var countryName =$("#Country option:selected").text().trim();
+      if(mobno!="" && event.key!="Backspace")
+      {
+        if(countryName=="United States")
+        {  
+            this.USFormatPhoneNumber(mobno);
+        }
+        else
+        {
+          this.OtherFormatPhoneNumber(mobno);
+        }
+      }   
+    };
+    OtherFormatPhoneNumber(mobno:any)
+    {
+      //var regex = /\d+/g;
+      //var matches = mobno.match(regex); //extract digit only
+      //var currentNum= matches==null?"" :matches.join('');
+      this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(mobno);
+    }
+    
+    USFormatPhoneNumber(mobno:any)
+    {
+      var newformat="";
+      if(mobno!="" && mobno!=null)
+      {
+        var regex = /\d+/g;
+        var matches = mobno.match(regex); //extract digit only
+        var currentNum= matches==null?"" :matches.join('');
+    
+        for(var ind=0;ind<currentNum.length;ind++)
+        {
+          if(newformat.length==3)
           {
-            var tempArr = mobno.split('-');
-      
-                if(tempArr.length==1)
-                {
-                  var countdigit=tempArr[0].length;
-                  newnum=tempArr[0];
-                  if(countdigit==3)
-                  {
-                    newnum=tempArr[0]+"-";
-                  }
-                  else if(countdigit>3)
-                  {
-                    newnum=tempArr[0].substr(0,3)+"-"+tempArr[0].substr(3,1);
-                  }
-                  
-                }
-                else if(tempArr.length==2)
-                {
-                  newnum=tempArr[0]+"-"+tempArr[1];
-                  var countdigit=tempArr[1].length;
-                  if(countdigit==3)
-                  {
-                    newnum=tempArr[0]+"-"+tempArr[1]+"-";
-                  }
-                  else if(countdigit>3)
-                  {
-                    newnum= tempArr[0]+"-"+tempArr[1].substr(0,3)+"-"+tempArr[1].substr(3,1);
-                  }
-                }
-                else
-                  {
-                    newnum=tempArr[0]+"-"+tempArr[1]+"-"+tempArr[2];
-                  }
-      
+            newformat=newformat+"-";
+          }
+          else if(newformat.length==7)
+          {
+            newformat=newformat+"-";
+          }   
+          newformat=newformat+currentNum[ind];
         }
-        this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(newnum);   
-      };
-
+    
+       }
+       this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(newformat);
+    }
+    
     openModal(template: TemplateRef<any>) {
         this.modalRef = this.modalService.show(template);
     }
@@ -376,6 +384,7 @@ export class SiteLicenseAccount implements OnInit {
             this.insertUpdateSiteLicenseFrm.controls['clientAdminId'].setValue(this.licenseSite.SiteUserId);
             this.insertUpdateSiteLicenseFrm.controls['clientAdminEmail'].setValue(this.licenseSite.SiteUserEmailId);
             this.GetSiteAccountEditions();
+            this.UpdatePhoneValidation();
          }, error => this.error = <any>error); 
     }
@@ -597,10 +606,39 @@ export class SiteLicenseAccount implements OnInit {
         }
         else {
           this.license.StateId = 0;
-          this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);
-		}
+          this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);     
+	    	}
+        this.UpdatePhoneValidation();
+      
+    }
+  //get Property
+  get PhoneNumber() {
+    return this.insertUpdateSiteLicenseFrm.get('phone');
+  } 
+  UpdatePhoneValidation()
+    {
+      var phoneno=this.PhoneNumber.value==null?"":this.PhoneNumber.value;
+    
+      var countryName =$("#Country option:selected").text().trim();
+      if(countryName=="United States")
+        {
+          // validate first phone number
+          this.IsUniteState=true;
+          this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]);
+          this.PhoneNumber.updateValueAndValidity();
+          this.USFormatPhoneNumber(phoneno);
+        }
+        else
+        {
+          this.IsUniteState=false;
+          this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+         // this.PhoneNumber.setValidators([Validators.required]);
+          this.PhoneNumber.updateValueAndValidity(); 
+          this.OtherFormatPhoneNumber(phoneno);
+        }
     }
+
     OnStateChange(element: any) {
         this.license.StateId = parseInt(element.value);
         if (this.lstState.find(C => C.Id == this.license.StateId).StateName != "Other") {
@@ -62,7 +62,8 @@ scrWidth:any;
 	  sortColumn:'Id', 
 	  sortOrder:'asc',
 	  pageNo:1,
-      pageLength:10	  
+      pageLength:10,
+      isGridBind:true	  
     }
 @HostListener('window:resize', ['$event'])
 getScreenSize(event?) {
@@ -324,7 +325,8 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
 				sortColumn:'Id', 
 	            sortOrder:'asc',
                 pageNo: 1, 
-                pageLength: 5
+                pageLength: 5,
+                isGridBind:true
             })
             .subscribe(x => 
             { 
@@ -29,11 +29,11 @@ export class ManageDiscountCodeService {
       + obj.discountCode
 	  + "&startDate=" + obj.startDate 
 	  + "&endDate=" + obj.endDate 
-	  + "&endDate=" + obj.endDate
 	  + "&sortColumn=" + obj.sortColumn
 	  + "&sortOrder=" + obj.sortOrder
 	  + "&pageNo=" + obj.pageNo 
 	  + "&pageLength=" + obj.pageLength
+    + "&isGridBind=" + obj.isGridBind
 	  )
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
@@ -61,7 +61,7 @@ export class DiscountCodeReport implements OnInit {
 		sFromDate:new Date(),
 		sToDate:new Date(),
 		iDiscountCode:0,
-		iAccountNumber:'',		
+		sAccountNumber:'',		
 		sortColumn:'StartDate', 
 		sortOrder:'asc',
 		pageNo:1,
@@ -188,8 +188,11 @@ export class DiscountCodeReport implements OnInit {
           discountCode: '',
           startDate: '',
           endDate: '',
+          sortColumn:'DiscountCode',
+          sortOrder:'asc',
           pageNo: 1, 
-          pageLength: 10000
+          pageLength: 10000,
+          isGridBind:false
       })
       .subscribe(x => { this.lstDiscountCode = x.DiscountCodeList; }, error => this.error = error);
   }
@@ -240,7 +243,7 @@ export class DiscountCodeReport implements OnInit {
 	  this.SearchField.sFromDate=this.DiscountCodeReportForm.controls['sFromDate'].value;
 	  this.SearchField.sToDate=this.DiscountCodeReportForm.controls['sToDate'].value;
 	  this.SearchField.iDiscountCode=this.DiscountCodeReportForm.controls['iDiscountCode'].value;
-	  this.SearchField.iAccountNumber=this.DiscountCodeReportForm.controls['iAccountNumber'].value;
+	  this.SearchField.sAccountNumber=this.DiscountCodeReportForm.controls['iAccountNumber'].value;
 	  this.SearchField.pageNo=this.pageNo;
@@ -123,7 +123,7 @@
                 <td>{{item.NetAdSubscription}}</td>
               </tr>
             </tbody>
-            <tfoot *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;">
+            <tfoot *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;position:relative;">
               <tr>
                 <td>{{total.LicenseType}}</td>
                 <td>{{total.AccountType}}</td>
@@ -136,6 +136,22 @@
               </tr>
             </tfoot>
           </table>
+        
+            <!-- <table class="table-hover  ui-widget-header sorttable" style="width:100%">
+               <thead *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;">
+                  <tr>
+                    <th style="width:180px" >{{total.LicenseType}}</th>
+                    <th style="width:230px">{{total.AccountType}}</th>
+                    <th style="width:300px">{{total.InstitutionName}}</th>              
+                    <th style="width:200px">{{total.LicenseCreationDate}}</th>
+                    <th style="width:300px">{{total.ActiveSubscription}}</th>
+                    <th style="width:200px">{{total.RenewSubscription}}</th>
+                    <th style="width:250px">{{total.InActiveSubscription}}</th>
+                    <th style="width:130px">{{total.NetAdSubscription}}</th>
+                  </tr>
+               </thead>
+            </table> -->
+
           <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetNetAdSummaryReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
@@ -81,7 +81,7 @@ export class NetAdSubscriptionReport implements OnInit {
     {
       this.scrHeight = window.innerHeight-405;
     }
-	 if(this.scrHeight<=360) this.scrHeight=360;
+	 if(this.scrHeight<=360) this.scrHeight=370;
      $(".ft_container").css("height",this.scrHeight);
     }
@@ -194,6 +194,8 @@ export class NetAdSubscriptionReport implements OnInit {
     }
 	GetNetAdSummaryReportList() {
+    
+   
        this._loadingService.ShowLoading("global-loading");
 	   $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc'); 
@@ -266,6 +268,7 @@ export class NetAdSubscriptionReport implements OnInit {
         this._loadingService.HideLoading("global-loading");
         this.buttonStatus = false;
       }
+     
     }
     ExportEvent() {
@@ -62,7 +62,7 @@ export class ChangeUserID implements OnInit {
       .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = <any>error);    
   }
   UpdateUserId() {
-    debugger;
+
     this.alerts = '';
     //if (this.ChangeUserIdFrm.value.newloginid == '') {
  import { Component, OnInit, Input, Output, EventEmitter, ElementRef, ViewChild } from "@angular/core";
 import {ConfirmService} from "./confirm.service";
 import { ModalComponent } from "ng2-bs3-modal/ng2-bs3-modal";
+import { Router } from '@angular/router';
 const KEY_ESC = 27;
 @Component({
@@ -41,7 +42,7 @@ export class ConfirmComponent implements OnInit {
     private _okAlert: any;
     private _closeAlert: any;
-    constructor(confirmService:ConfirmService) {
+    constructor(confirmService:ConfirmService,private router: Router) {
         confirmService.activate = this.activate.bind(this);
     }
@@ -178,6 +179,9 @@ export class ConfirmComponent implements OnInit {
         if (this.type.toString() == "alertMsg") {
             this.alertMessageModal.close();
+            var url= this.router.url;
+            if(url=='/changeuserpassword' || url== '/changeuserid')
+            this.router.navigate(['/']);
             return;
         }
         if (this.type.toString() == "alertMsg2") {