diff --git a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj index 3b104ce..2a9cbf9 100644 --- a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj +++ b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj @@ -178,7 +178,7 @@ - True + False True 63874 / diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config index 752b3e8..15cbdb2 100644 --- a/400-SOURCECODE/AIAHTML5.API/Web.config +++ b/400-SOURCECODE/AIAHTML5.API/Web.config @@ -63,9 +63,8 @@ - - - + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index beb8ecd..4025835 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -2974,6 +2974,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ width: $rootScope.AIWindowData[i].width }, imageId: $rootScope.AIWindowData[i].imageId, + imgLeft:$rootScope.AIWindowData[i].imgLeft, minimised: $rootScope.AIWindowData[i].minimised, windowTitle: $rootScope.AIWindowData[i].currentViewTitle, maximised: $rootScope.AIWindowData[i].maximised, @@ -3206,7 +3207,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ height: $rootScope.AAWindowData[i].height }, id: $rootScope.AAWindowData[i].id, - imgLeft:$rootScope.AAWindowData[i].imgLeft, showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins, hideCallOuts: false,//N showAllPins: $rootScope.AAWindowData[i].isShowAllPins, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 205b537..b8b9f3a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -525,7 +525,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } ; - //window.parent.closeIFrame(); window.parent.AIAModuleOpenResourceInfo(DaopenData); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 5a037b5..b4fe38b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -611,11 +611,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.homeURL =x.substring(0,pos+1); var hTopicUrl = $rootScope.homeURL + "content/help/index.html"; - var aboutADAM = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; + var productCredit = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; + var customerSupport = "http://adameducation.com/Contact"; + var userAgreement = "https://store.adameducation.com/EmailTemplate/EULA.html"; + var aboutADAM = "https://www.adam.com/about"; + $("#helplinkId").append("
  • Help Topics
    • "); - $("#helplinkId").append("
  • Customer Support
    • "); + $("#helplinkId").append("
  • Customer Support
    • "); $("#helplinkId").append(""); + $("#helplinkId").append("
  • End User License Agreement
    • "); + $("#helplinkId").append("
  • Product Credits
    • "); $("#helplinkId").append("
  • About A.D.A.M.
    • "); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index ea1b814..c9c0c96 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -233,8 +233,6 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, window.parent.AIAModuleOpenResourceInfo(LEopenData); - window.parent.closeIFrame(); - } else { // $rootScope.menuLabExer = 1;//used in home controller @@ -488,7 +486,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, var userloginid = JSON.parse(localStorage.getItem('loggedInUserDetails')).Id; $scope.SetLEwindowStoreData(windowviewid, 'userloginid', userloginid); - + $timeout(function () { var isMaximize = $scope.GetLEwindowStoreData(windowviewid, 'maximised'); @@ -512,15 +510,62 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, $scope.SetLEwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); $scope.SetLEwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); - $scope.setControlsIDs(windowviewid); - $scope.createScopeVariable(windowviewid); - - $scope.labViewID = "LabView_" + windowviewid; - var labViewElement = angular.element(document.getElementById($scope.labViewID)); - - $compile(labViewElement.contents())($scope); - - + + $scope.setControlsIDs(windowviewid); + + var timeintval = null; + timeintval = $interval(function () { + $scope.labViewID = "LabView_" + windowviewid; + var labViewElement = angular.element(document.getElementById($scope.labViewID)); + if (document.getElementById($scope.labViewID) != null) + { + var panelBody = document.getElementById("panelbodyDiv_" + windowviewid); + var len = panelBody!=null?(panelBody.id).split("_").length:0; + if (len>1) { + $scope.stopLabIntervalLoader(); + $compile(labViewElement.contents())($scope); + $scope.createScopeVariable(windowviewid); + + //wait until DOM element load of Lab + + $scope.PanelActivity(); + $scope.JsPanelclick(windowviewid); + + var canvasDIvHeight = $('#labImagePanel_' + windowviewid+ " .jsPanel-content").height(); + $('#panelbodyDiv_' + windowviewid).css("height",canvasDIvHeight-100); + $('#resultbodyDiv_' + windowviewid).css("height",canvasDIvHeight-90); + + $scope.LoadLabExercise(windowviewid,userloginid,Identifier); + + } + else + { + $scope.setControlsIDs(windowviewid); + console.log("waiting for loading content"); + } + + } + else + { + $scope.setControlsIDs(windowviewid); + console.log("waiting for loading view scope"); + } + + + },100); + $scope.stopLabIntervalLoader = function () { + if (angular.isDefined(timeintval)) { + $interval.cancel(timeintval); + timeintval = undefined; + } + }; + + + }, 100); + } + + $scope.LoadLabExercise = function (windowviewid,userloginid,Identifier) { + var labExerciseInfo = { userId: userloginid, identifier: Identifier, @@ -528,13 +573,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, LabExerciseService.GetLabExercise(labExerciseInfo) .then( function (labResult) { - - $timeout(function () { - var canvasDIvHeight = $('#labImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#panelbodyDiv_' + windowviewid).css("height",canvasDIvHeight-100); - $('#resultbodyDiv_' + windowviewid).css("height",canvasDIvHeight-90); - $scope.JsPanelclick(windowviewid); - + if (labResult != undefined && labResult.lastQuestion > 0 && labResult != AIAConstants.SAVED_LAB_EXERCISE_NOT_FOUND) { $scope.SetLEwindowStoreData(windowviewid, 'SavedLabExercise', labResult); @@ -550,18 +589,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, } $scope.DisableLabUI(windowviewid); - },300) - }, function (error) { console.log('error in getting save ddata'); $scope.DisableLabUI(windowviewid); - } - ) - - $scope.PanelActivity(); - }, 500); - } + }) + } + $scope.JsPanelclick = function (windowviewid) { //reset option list manager and annotation diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 037f268..32b74a5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -366,8 +366,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou window.parent.AIAModuleOpenResourceInfo(AAopenData); - window.parent.closeIFrame(); - } else { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index e402021..2e8f9fc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -20,6 +20,7 @@
  • Print Active Viewer
  • Print All Open Viewers
  • Print Preview
    • +
    • Cascade View
      • diff --git a/400-SOURCECODE/AIAHTML5.Web/content/help/about/Adam_Credits_AIA5.html b/400-SOURCECODE/AIAHTML5.Web/content/help/about/Adam_Credits_AIA5.html index 30302e2..0f8659b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/content/help/about/Adam_Credits_AIA5.html +++ b/400-SOURCECODE/AIAHTML5.Web/content/help/about/Adam_Credits_AIA5.html @@ -88,29 +88,29 @@
      Technical Support

      -
      -
      Online Technology Production & Quality Assurance
      -
      + + + -
      -
      Magic Software Pvt Ltd
      -
      + + + -
      -


      -
      + + + -
      -
      Online Help Guides
      -
      + + + -
      -
      Stan Samuels
      -
      + + + -
      -
      Brent Brickett

      -
      + + +
      Medical Illustration and Animation Development
      diff --git a/400-SOURCECODE/Admin/src/app/app.component.ts b/400-SOURCECODE/Admin/src/app/app.component.ts index 57163da..ddd925c 100644 --- a/400-SOURCECODE/Admin/src/app/app.component.ts +++ b/400-SOURCECODE/Admin/src/app/app.component.ts @@ -33,6 +33,8 @@ export class AppComponent implements OnInit { public submenustaus: string; public UpdateProfileVisible: boolean; public UserManageRightsList: Array; + + public LicenseTypeId:any; constructor(private idle: Idle, private keepalive: Keepalive,private titleService: Title,private _confirmService: ConfirmService,private userservice: UserService,private _loadingService: LoadingService, public global: GlobalService, private router: Router,) { const projectTitle= this.titleService.getTitle(); @@ -95,7 +97,26 @@ export class AppComponent implements OnInit { ngOnInit(): void { this.menustaus = "True"; this.global.getJSON().subscribe(data => { - this.obj = data["AdminSections"] + this.obj = data["AdminSections"] ; + this.LicenseTypeId=this.global.LicenseTypeId; + if(this.LicenseTypeId !=undefined && this.LicenseTypeId!=0 && this.global.UserTypeName=="Client Admin") + { + if(this.obj[2].UserType=="Client Admin") + { + var mainsection=this.obj[2]; + var clientadminSection=mainsection.HeaderMenu[4]; + var siteUageReportSection=clientadminSection.SubMenu[6]; + var concurrentLicenseId=siteUageReportSection.LicenseTypeId; + + //do not show this report for concurrent license of client admin + if(concurrentLicenseId ==this.LicenseTypeId) + { + siteUageReportSection.SubMenuStatus="False"; + } + } + } + + for (let i = 0; i < 7; i++) { if (this.obj[i].Id == this.global.UserType) { if (this.global.UserTypeName == "General Admin") { @@ -104,7 +125,7 @@ export class AppComponent implements OnInit { UserId: this.global.UserId, UserType: this.global.UserTypeName }).subscribe(x => { - //console.log(x); this.UserManageRightsList = x; + this.UserManageRightsList = x; this.objMenuGernal = this.obj[i].HeaderMenu; //this.objMenuGernal = this.objMenu; //this.objMenu=''; diff --git a/400-SOURCECODE/Admin/src/app/app.module.ts b/400-SOURCECODE/Admin/src/app/app.module.ts index cedbc89..d07a795 100644 --- a/400-SOURCECODE/Admin/src/app/app.module.ts +++ b/400-SOURCECODE/Admin/src/app/app.module.ts @@ -44,6 +44,7 @@ import { LicenseModestySettings } from './components/licenseentity/licensemodest import { LicenseModuleSettings } from './components/licenseentity/licensemodulesettings.component'; import { SiteLicenseAccount } from './components/licenseentity/sitelicenseaccount.component'; import { UserGroup } from './components/userentity/usergroup.component'; +import { licenseAgreement } from './components/licenseentity/licenseAgreement.component'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app.routing.module'; //import { AuthGuard } from '../app/authguard.service'; @@ -82,7 +83,7 @@ import { MyFilterPipe } from './shared/my-filter.pipe'; ExpiringSubscriptionReport, SubscriptionReport, SubscriptionCancellationReport, NetAdSubscriptionReport, SiteLicenseUsageReport, DiscountCodeReport, ImageExportReport, - EditLicenseBasicSettings, LicenseModestySettings, + EditLicenseBasicSettings, LicenseModestySettings,licenseAgreement, LicenseModuleSettings, SiteLicenseAccount, UserGroup, PagerComponent, NumberOnlyDirective, //filter MyFilterPipe diff --git a/400-SOURCECODE/Admin/src/app/app.routing.module.ts b/400-SOURCECODE/Admin/src/app/app.routing.module.ts index 35be9fd..2213f66 100644 --- a/400-SOURCECODE/Admin/src/app/app.routing.module.ts +++ b/400-SOURCECODE/Admin/src/app/app.routing.module.ts @@ -24,6 +24,8 @@ import { LicenseModestySettings } from './components/licenseentity/licensemodest import { LicenseModuleSettings } from './components/licenseentity/licensemodulesettings.component'; import { SiteLicenseAccount } from './components/licenseentity/sitelicenseaccount.component'; import { UserGroup } from './components/userentity/usergroup.component'; +import { licenseAgreement } from './components/licenseentity/licenseAgreement.component'; + const appRoutes: Routes = [ //{ path: '', redirectTo:'updateuserprofile',pathMatch } { path: 'updateuserprofile', component: UpdateUserProfile }, @@ -49,6 +51,7 @@ const appRoutes: Routes = [ { path: 'editlicensebasicsettings', component: EditLicenseBasicSettings }, { path: 'licensemodestysettings', component: LicenseModestySettings }, { path: 'licensemodulesettings', component: LicenseModuleSettings }, + { path: 'licenseAgreement', component: licenseAgreement }, { path: 'sitelicenseaccount', component: SiteLicenseAccount }, { path: 'usergroup', component: UserGroup } ]; diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html index 2924a11..12e29d6 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html @@ -242,6 +242,7 @@ {{item.StateName}} +
      State is required
      @@ -277,7 +278,7 @@
      - (xxx-xxx-xxxx) + (xxx-xxx-xxxx)
      Phone is required
      Phone is invalid
      diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts index ecf20fc..4fe0258 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts @@ -50,6 +50,7 @@ export class AddLicense implements OnInit { dateStartInvalid: boolean = false; dateEndInvalid: boolean = false; dateRenewInvalid: boolean = false; + IsUniteState:Boolean=false; NumberOfRows:number=0; constructor(private _loadingService: LoadingService,private licenseService: LicenseService, private globalService: GlobalService, private router: Router, private activeRoute: ActivatedRoute, @@ -76,11 +77,12 @@ export class AddLicense implements OnInit { address1: ['', [Validators.required,this.noWhitespaceValidator]], address2: [''], city: ['', [Validators.required,this.noWhitespaceValidator]], - stateId: [0, Validators.min(1)], + stateId: [0, [Validators.min(1)]], countryId: [0, Validators.min(1)], zip: ['', [Validators.required]], emailId: ['', [Validators.required]], - phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]], + //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]], + phone: ['', [Validators.required]], editionLoginArr: this.fb.array([]), editionLogins: [''], totalLogins: [0], @@ -198,47 +200,86 @@ export class AddLicense implements OnInit { onKeyUp(event: any) { var mobno = event.target.value; - var newnum=mobno; - if(mobno!="" && event.key!="Backspace") + var countryName =$("#Country option:selected").text().trim(); + + if(mobno!="" && event.key!="Backspace") + { + if(countryName=="United States") + { + this.USFormatPhoneNumber(mobno); + } + else { - 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]; - } - + this.OtherFormatPhoneNumber(mobno); + } } - this.insertUpdateLicenseFrm.controls['phone'].setValue(newnum); }; + +OtherFormatPhoneNumber(mobno:any) +{ + //var regex = /\d+/g; + //var matches = mobno.match(regex); //extract digit only + //var currentNum= matches==null?"" :matches.join(''); + this.insertUpdateLicenseFrm.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) { this.modalRef = this.modalService.show(template); } @@ -469,15 +510,9 @@ export class AddLicense implements OnInit { this.insertUpdateLicenseFrm.controls['isActive'].setValue('false'); } - // this.insertUpdateLicenseFrm.controls['phone'].clearValidators(); - // if (this.lstCountry.find(C => C.Id == this.license.CountryId).CountryName != "United States") { - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]); - // } - // else { - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]); - // } - // this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity(); this.insertUpdateLicenseFrm.controls['phone'].setValue(this.license.Phone); + // validate first phone number + this.UpdatePhoneValidation(); if (this.license.EditionLogins == null) return; var TempArr = this.license.EditionLogins.split('|'); @@ -774,16 +809,12 @@ export class AddLicense implements OnInit { if (this.lstCountry.find(C => C.Id == this.license.CountryId).CountryName != "United States") { this.license.StateId = this.lstState.find(C => C.StateName == "Other").Id; this.insertUpdateLicenseFrm.controls['stateId'].setValue(this.license.StateId); - // this.insertUpdateLicenseFrm.controls['phone'].clearValidators(); - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]); } else { this.license.StateId = 0; this.insertUpdateLicenseFrm.controls['stateId'].setValue(this.license.StateId); - // this.insertUpdateLicenseFrm.controls['phone'].clearValidators(); - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]); } - //this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity(); + this.UpdatePhoneValidation(); } OnStateChange(element: any) { @@ -791,16 +822,11 @@ export class AddLicense implements OnInit { if (this.lstState.find(C => C.Id == this.license.StateId).StateName != "Other") { this.license.CountryId = this.lstCountry.find(C => C.CountryName == "United States").Id; this.insertUpdateLicenseFrm.controls['countryId'].setValue(this.license.CountryId); - // this.insertUpdateLicenseFrm.controls['phone'].clearValidators(); - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]); } else { this.license.CountryId = 0; this.insertUpdateLicenseFrm.controls['countryId'].setValue(this.license.CountryId); - // this.insertUpdateLicenseFrm.controls['phone'].clearValidators(); - // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]); - } - // this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity(); + } } SubscriptionPriceBlur() { diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html index a01d332..0d7d4dd 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html @@ -122,15 +122,16 @@ {{item.StateName}} +
      State is required
      - - @@ -138,12 +139,12 @@
      - +
      - (xxx-xxx-xxxx) + (xxx-xxx-xxxx)
      Phone is required
      -
      Phone is invalid
      +
      Phone is invalid
      diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts index 14a140e..50ae43b 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts @@ -32,6 +32,7 @@ export class EditLicenseBasicSettings implements OnInit { MinusCharater: number; LicenseId:number=0; AccountNumber:string=''; + IsUniteState:Boolean=false; constructor(private _loadingService: LoadingService,private licenseService: LicenseService, public globalService: GlobalService, private router: Router, @@ -53,11 +54,12 @@ export class EditLicenseBasicSettings implements OnInit { address1: ['', [Validators.required,this.noWhitespaceValidator]], address2: [''], city: ['', [Validators.required,this.noWhitespaceValidator]], - stateId: [0], + stateId: [0, [Validators.min(1)]], countryId: [0], zip: ['', [Validators.required]], emailId: ['', [Validators.required]], - phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]], + //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]], + phone: ['', [Validators.required]] }); this.GetCountry(); this.GetState(); @@ -114,57 +116,100 @@ export class EditLicenseBasicSettings implements OnInit { return isValid ? null: { 'whitespace': true }; } + onKeyUp(event: any) { var mobno = event.target.value; - var newnum=mobno; - if(mobno!="" && event.key!="Backspace") + var countryName =$("#Country option:selected").text().trim(); + if(mobno!="" && event.key!="Backspace") + { + if(countryName=="United States") + { + this.USFormatPhoneNumber(mobno); + } + else { - 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]; - } + this.OtherFormatPhoneNumber(mobno); + } +} + +}; - } - this.updateLicenseBasicSettingsFrm.controls['phone'].setValue(newnum); - +OtherFormatPhoneNumber(mobno:any) +{ + //var regex = /\d+/g; + //var matches = mobno.match(regex); //extract digit only + //var currentNum= matches==null?"" :matches.join(''); + this.updateLicenseBasicSettingsFrm.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) { this.modalRef = this.modalService.show(template); } GetCountry() { this.licenseService.GetCountry() - .subscribe(y => { this.lstCountry = y; }, error => this.error = error); + .subscribe(y => { + this.lstCountry = y; + }, error => this.error = error); } GetState() { @@ -207,6 +252,8 @@ export class EditLicenseBasicSettings implements OnInit { this.updateLicenseBasicSettingsFrm.controls['emailId'].setValue(this.license.EmailId); this.updateLicenseBasicSettingsFrm.controls['phone'].setValue(this.license.Phone); this._loadingService.HideLoading("global-loading"); + + this.UpdatePhoneValidation(); }, error => this.error = error); } diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html new file mode 100644 index 0000000..65abeb9 --- /dev/null +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html @@ -0,0 +1,168 @@ + +
      + +
      +

      Product License

      +
      + + +
      +
      +
      + +
      +
      +
      +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      + + + + + +
      + +
      + +
      + +
      +
      + +
      +
      +
      + + + + + + + + + + + + + +
      ProductNo of Login
      {{item.Title}} + +
      +
      +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      +
      + +
      +
      + +
      + +
      +
      +
      +
      +
      +
      +
      +
      + diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.ts new file mode 100644 index 0000000..d1b12ab --- /dev/null +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.ts @@ -0,0 +1,239 @@ +import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, Pipe, PipeTransform,HostListener, TemplateRef } from '@angular/core'; +import { LicenseService } from './license.service'; +import { Router } from '@angular/router'; +import { GlobalService } from '../../shared/global'; +import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { License } from '../userentity/datamodel'; +import { ConfirmService } from '../../shared/confirm/confirm.service'; +import { LoadingService } from '../../shared/loading.service'; +import * as jQuery from 'jquery'; +declare var $:JQueryStatic; +@Component({ + templateUrl: './licenseAgreement.component.html' +}) + +export class licenseAgreement implements OnInit { + + lstLicenceType: any; + lstCountry: any; + lstState: any; + lstLicense: any; + lstAccountType: any; + lstEdition: any; + lstEditionLogins: any; + license: License; + LicenseAgreementFrm: FormGroup; + error: any; + tempLstAccountNumbers: any; + UserType:number; + constructor(private _loadingService: LoadingService,private licenseService: LicenseService, private globalService: GlobalService, + private fb: FormBuilder, private router: Router) { + this.UserType =this.globalService.UserType; + } + + ngOnInit(): void { + this._loadingService.ShowLoading("global-loading"); + if( this.UserType<=2) + { + $('#accountSelect').chosen({allow_single_deselect:true,width:'300px',placeholder_text_single:'Select Account',search_contains:true}); + } + else + { + $("#accountsection").css("display","none"); + } + + + this.license = new License(); + this.license.LicenseId=0; + this.UserType =this.globalService.UserType; + this.LicenseAgreementFrm = this.fb.group({ + licenseId: [0], + accountNumber: [''], + accountTypeId: [0], + accountTypeName: [''], + licenseeFirstName: [''], + licenseeLastName: [''], + licenseTypeId: [1], + licenseTypeName: [''], + institutionName: [''], + address1: [''], + address2: [''], + city: [''], + stateId: [0], + stateName: [''], + countryId: [0], + countryName: [''], + zip: [''], + emailId: [''], + phone: [''], + editionLoginArr: this.fb.array([]), + editionLogins: [''] + }); + + this.GetLicenseType(); + this.GetState(); + this.GetAccountType(); + this.GetCountry(); + + this.licenseService.GetEditions() + .subscribe(x => { + this.lstEdition = x; + }, error => this.error = error); + + + if (this.UserType <=2) { + this._loadingService.ShowLoading("global-loading"); + this.GetLicenseAccounts(); + } + + $('#accountSelect') + .on('change', (e, args) => { + var selectedValue = Number(args.selected); + var selectedText= $(".chosen-single span" ).text(); + this.AccountNumberChanged(selectedValue,selectedText); + }); + + } + + GetLicenseType() { + this.licenseService.GetLicenceType() + .subscribe(x => { + this.lstLicenceType = x; + }, error => this.error = error); + } + + GetAccountType() { + this.licenseService.GetAccountType() + .subscribe(x => { + this.lstAccountType = x; + }, error => this.error = error); + } + + GetState() { + this.licenseService.GetState() + .subscribe(st => { + this.lstState = st; + }, error => this.error = error); + } + + GetCountry() { + this.licenseService.GetCountry() + .subscribe(y => { + this.lstCountry = y; + + if (this.UserType > 2) { + //waiting for data + this.AccountNumberChanged(this.globalService.AccLicId,this.globalService.AccountNumber); + } + + }, error => this.error = error); + } + + GetLicenseAccounts() { + this.tempLstAccountNumbers=[]; + this.licenseService.GetLicenseAccounts(0) + .subscribe(st => { + var newOption = $(''); + $('#accountSelect').append(newOption); + this.tempLstAccountNumbers=st; + setTimeout(function(){ + $('#accountSelect').trigger('chosen:updated'); + }, 500); + this._loadingService.HideLoading("global-loading"); + + }, error => this.error = error); + } + + + AccountNumberChanged(LicenseId: number,AccountNumber:string) { + + this.LicenseAgreementFrm.reset(); + if (LicenseId == 0) { + return; + } + this._loadingService.ShowLoading("global-loading"); + + this.license.LicenseId = LicenseId; + this.GetLicenseById(); + } + + GetLicenseById() { + if (this.license.LicenseId != 0) { + this.licenseService.GetLicenseById(this.license.LicenseId) + .subscribe(st => { + this.license = st; + + this.LicenseAgreementFrm.controls['licenseId'].setValue(this.license.LicenseId); + this.LicenseAgreementFrm.controls['licenseTypeId'].setValue(this.license.LicenseTypeId); + this.LicenseAgreementFrm.controls['accountNumber'].setValue(this.license.AccountNumber); + this.LicenseAgreementFrm.controls['accountTypeId'].setValue(this.license.AccountTypeId); + this.LicenseAgreementFrm.controls['licenseeFirstName'].setValue(this.license.LicenseeFirstName); + this.LicenseAgreementFrm.controls['licenseeLastName'].setValue(this.license.LicenseeLastName); + this.LicenseAgreementFrm.controls['institutionName'].setValue(this.license.InstitutionName); + this.LicenseAgreementFrm.controls['address1'].setValue(this.license.Address1); + this.LicenseAgreementFrm.controls['address2'].setValue(this.license.Address2); + this.LicenseAgreementFrm.controls['city'].setValue(this.license.City); + this.LicenseAgreementFrm.controls['stateId'].setValue(this.license.StateId); + this.LicenseAgreementFrm.controls['countryId'].setValue(this.license.CountryId); + this.LicenseAgreementFrm.controls['zip'].setValue(this.license.Zip); + this.LicenseAgreementFrm.controls['emailId'].setValue(this.license.EmailId); + this.LicenseAgreementFrm.controls['editionLogins'].setValue(this.license.EditionLogins); + + this.LicenseAgreementFrm.controls['phone'].setValue(this.license.Phone); + + var LicenseType= this.lstLicenceType.find(ft=>ft.Id==this.license.LicenseTypeId).Title; + var AccountType= this.lstAccountType.find(ft=>ft.Id==this.license.AccountTypeId).Title; + var state= this.lstState.find(ft=>ft.Id==this.license.StateId).StateName; + var country= this.lstCountry.find(ft=>ft.Id==this.license.CountryId).CountryName; + + this.LicenseAgreementFrm.controls['licenseTypeName'].setValue(LicenseType); + this.LicenseAgreementFrm.controls['accountTypeName'].setValue(AccountType); + this.LicenseAgreementFrm.controls['stateName'].setValue(state); + this.LicenseAgreementFrm.controls['countryName'].setValue(country); + + if (this.license.EditionLogins == null) return; + var TempArr = this.license.EditionLogins.split('|'); + this.lstEditionLogins = new Array(); + this.lstEdition.forEach(element => { + if (this.license.LicenseTypeId == 4) { + if (element.Id == 1 || element.Id == 3) { + var Check: boolean = false; + TempArr.forEach(elm => { + var TempInnerArr = elm.split('-'); + if (TempInnerArr[0] == element.Id) { + this.lstEditionLogins.push({ Id: element.Id, Title: element.Title, Login: parseInt(TempInnerArr[1]), Checked: 1 }); + Check = true; + } + }); + if (!Check) { + this.lstEditionLogins.push({ Id: element.Id, Title: element.Title, Login: 0, Checked: 0 }); + } + } + } + else { + var Check: boolean = false; + TempArr.forEach(elm => { + var TempInnerArr = elm.split('-'); + if (TempInnerArr[0] == element.Id) { + this.lstEditionLogins.push({ Id: element.Id, Title: element.Title, Login: parseInt(TempInnerArr[1]), Checked: 1 }); + Check = true; + } + }); + if (!Check) { + this.lstEditionLogins.push({ Id: element.Id, Title: element.Title, Login: 0, Checked: 0 }); + } + } + }); + this.LicenseAgreementFrm.setControl('editionLoginArr', this.fb.array(this.lstEditionLogins)); + + this._loadingService.HideLoading("global-loading"); + }, + error => this.error = error); + } + } + + CloseLicense() { + this.router.navigate(['/']); + } + +} diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html index 15f2900..03857d6 100644 --- a/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html +++ b/400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html @@ -175,7 +175,7 @@ - + {{esr.AccountNumber}} {{esr.LicenseeName}} {{esr.LicenseType}} diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts index a59e83f..104405b 100644 --- a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts @@ -104,7 +104,8 @@ export class SiteLicenseUsageReport implements OnInit { iLoginTypeId:[0] }); if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") { - this.SiteLicenseUsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber) + this.SiteLicenseUsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber); + this.SearchField.sAccountNumber=this.global.AccountNumber; this.DisableAccountNumberControl = true; } this.GetEdition(); diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts index ced699f..1126d7a 100644 --- a/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts @@ -112,7 +112,8 @@ export class UsageReport implements OnInit, AfterViewChecked { iCountry: [0] }); if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") { - this.UsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber) + this.UsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber); + this.SearchField.sAccountNumber=this.global.AccountNumber; this.DisableAccountNumberControl = true; } this.alerts = ''; @@ -120,7 +121,7 @@ export class UsageReport implements OnInit, AfterViewChecked { this.GetState(); this.recordCount = 0; - this.pageNo = 0; + this.pageNo = 1; this.pageLength = 10; this.pagerComponent = new PagerComponent(); diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts index 157674d..8b584b0 100644 --- a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts @@ -156,7 +156,8 @@ export class UsersList implements OnInit, AfterViewChecked { { if(this.global.AccountNumber !=undefined && this.global.AccountNumber !="") { - this.Users.controls['AccountNumber'].setValue(this.global.AccountNumber) + this.Users.controls['AccountNumber'].setValue(this.global.AccountNumber); + this.SearchField.AccountNumber=this.global.AccountNumber; this.DisableAccountNumberControl = true; } diff --git a/400-SOURCECODE/Admin/src/app/shared/Pager/pager.component.html b/400-SOURCECODE/Admin/src/app/shared/Pager/pager.component.html index 74ae07c..593006a 100644 --- a/400-SOURCECODE/Admin/src/app/shared/Pager/pager.component.html +++ b/400-SOURCECODE/Admin/src/app/shared/Pager/pager.component.html @@ -1,5 +1,5 @@
      -
      +
      @@ -12,7 +12,7 @@
      -
      +
      -
      -
      +
      +
      -
      -
      +
      +
      diff --git a/400-SOURCECODE/Admin/src/app/shared/global.ts b/400-SOURCECODE/Admin/src/app/shared/global.ts index 696a196..7642c4b 100644 --- a/400-SOURCECODE/Admin/src/app/shared/global.ts +++ b/400-SOURCECODE/Admin/src/app/shared/global.ts @@ -30,6 +30,7 @@ export class GlobalService { SessionId:number=0; isSiteUser:boolean=false; isAdmin:boolean=false; + LicenseTypeId:number=0; RemoveColumns: Array = ["Serial_No", "LicenseId","RowNum"] error; public href: string = ""; @@ -58,7 +59,11 @@ export class GlobalService { this.aiaPingInterval=this.loggedInUser.aiaPingInterval; this.SessionId=this.loggedInUser.SessionId; this.isSiteUser=this.loggedInUser.isSiteUser; - this.isAdmin=this.loggedInUser.LicenseId==0?true:false;; + this.isAdmin=this.loggedInUser.LicenseId==0?true:false; + + if (this.loggedInUser.LicenseInfo != null) { + this.LicenseTypeId=this.loggedInUser.LicenseInfo.LicenseTypeId; + } } @@ -88,7 +93,7 @@ export class GlobalService { if (this.resourceBaseUrl == this.ProtocolType+"localhost/API/Adminapi/") { if (this.UserTypeName == "Client Admin" || this.UserTypeName == "District Admin") { - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim(); } if (this.loggedInUser.LicenseInfo == null) { this.AccLicId = 0; @@ -97,7 +102,7 @@ export class GlobalService { } else { this.AccLicId = this.loggedInUser.LicenseInfo.Id; - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber; + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim(); } } @@ -107,7 +112,7 @@ export class GlobalService { { this.LiveURL = this.ProtocolType+"interactiveanatomy.com"; if (this.UserTypeName == "Client Admin" || this.UserTypeName == "District Admin") { - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim(); this.AccLicId = this.loggedInUser.LicenseInfo.Id; } if (this.loggedInUser.LicenseInfo == null) { @@ -117,7 +122,7 @@ export class GlobalService { } else { this.AccLicId = this.loggedInUser.LicenseInfo.Id; - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber; + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim(); } } @@ -127,7 +132,7 @@ export class GlobalService { { this.LiveURL = this.ProtocolType+"qa.beta.interactiveanatomy.com"; if (this.UserTypeName == "Client Admin" || this.UserTypeName == "District Admin") { - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim(); this.AccLicId = this.loggedInUser.LicenseInfo.Id; } if (this.loggedInUser.LicenseInfo == null) { @@ -137,7 +142,7 @@ export class GlobalService { } else { this.AccLicId = this.loggedInUser.LicenseInfo.Id; - this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber; + this.AccountNumber = this.loggedInUser.LicenseInfo.AccountNumber.trim();; } } diff --git a/400-SOURCECODE/Admin/src/assets/data/Menu.json b/400-SOURCECODE/Admin/src/assets/data/Menu.json index 6237dd7..5584eda 100644 --- a/400-SOURCECODE/Admin/src/assets/data/Menu.json +++ b/400-SOURCECODE/Admin/src/assets/data/Menu.json @@ -26,6 +26,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -35,13 +41,13 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "True" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "True" @@ -55,13 +61,13 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "True" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "True" @@ -75,25 +81,25 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "True" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "True" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "True" @@ -107,55 +113,55 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "True" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "True" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "True" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "True" @@ -169,7 +175,7 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "True" @@ -183,19 +189,19 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "True" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "True" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "True" @@ -233,6 +239,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "False" } ] }, @@ -242,13 +254,13 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "True" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "True" @@ -262,13 +274,13 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "True" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "True" @@ -282,25 +294,25 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "True" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "True" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "True" @@ -314,55 +326,55 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "True" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "True" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "True" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "True" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "True" @@ -376,7 +388,7 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "True" @@ -390,19 +402,19 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "True" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "True" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "True" @@ -440,6 +452,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -449,13 +467,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "False" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "False" @@ -469,13 +487,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "False" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "False" @@ -489,25 +507,25 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "True" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "True" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "True" @@ -521,55 +539,56 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "False" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "False" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", + "LicenseTypeId": 1, "SubMenuStatus": "True" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "False" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "False" @@ -583,7 +602,7 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "False" @@ -597,19 +616,19 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "True" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "True" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "False" @@ -648,6 +667,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -657,13 +682,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "False" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "False" @@ -677,13 +702,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "False" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "False" @@ -697,25 +722,25 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "True" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "True" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "False" @@ -729,55 +754,55 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "True" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "False" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "False" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "False" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "False" @@ -791,7 +816,7 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "True" @@ -805,19 +830,19 @@ "HeaderMenuStatus": "True", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "True" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "True" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "False" @@ -855,6 +880,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -864,13 +895,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "False" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "False" @@ -884,13 +915,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "False" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "False" @@ -904,25 +935,25 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "False" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "False" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "False" @@ -936,55 +967,55 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "False" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "False" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "False" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "False" @@ -998,7 +1029,7 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "False" @@ -1012,19 +1043,19 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "False" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "False" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "False" @@ -1062,6 +1093,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -1071,13 +1108,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "False" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "False" @@ -1091,13 +1128,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "False" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "False" @@ -1111,25 +1148,25 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "False" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "True" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "False" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "False" @@ -1143,55 +1180,55 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "False" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "False" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "False" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "False" @@ -1205,7 +1242,7 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "False" @@ -1219,19 +1256,19 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "False" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "False" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "False" @@ -1269,6 +1306,12 @@ "SubMenuName": "Change User ID", "SubMenuUrl": "changeuserid", "SubMenuStatus": "True" + }, + { + "SubMenuId": "203", + "SubMenuName": "Product License Agreement", + "SubMenuUrl": "licenseAgreement", + "SubMenuStatus": "True" } ] }, @@ -1278,13 +1321,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "203", + "SubMenuId": "204", "SubMenuName": "Search License", "SubMenuUrl": "searchlicense", "SubMenuStatus": "False" }, { - "SubMenuId": "204", + "SubMenuId": "205", "SubMenuName": "Add New License", "SubMenuUrl": "addlicense", "SubMenuStatus": "False" @@ -1298,13 +1341,13 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "205", + "SubMenuId": "206", "SubMenuName": "Manage Discount Code", "SubMenuUrl": "managediscountcode", "SubMenuStatus": "False" }, { - "SubMenuId": "206", + "SubMenuId": "207", "SubMenuName": "Subscription Price", "SubMenuUrl": "subscriptionprice", "SubMenuStatus": "False" @@ -1318,25 +1361,25 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "207", + "SubMenuId": "208", "SubMenuName": "List User", "SubMenuUrl": "users", "SubMenuStatus": "False" }, { - "SubMenuId": "208", + "SubMenuId": "209", "SubMenuName": "Add User", "SubMenuUrl": "adduser", "SubMenuStatus": "False" }, { - "SubMenuId": "209", + "SubMenuId": "210", "SubMenuName": "Unblock User", "SubMenuUrl": "unblockuser", "SubMenuStatus": "False" }, { - "SubMenuId": "210", + "SubMenuId": "211", "SubMenuName": "User Group", "SubMenuUrl": "usergroup", "SubMenuStatus": "False" @@ -1350,55 +1393,55 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "211", + "SubMenuId": "212", "SubMenuName": "Usage Report", "SubMenuUrl": "usagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "212", + "SubMenuId": "213", "SubMenuName": "Customer Summary Report", "SubMenuUrl": "customersummaryreport", "SubMenuStatus": "False" }, { - "SubMenuId": "213", + "SubMenuId": "214", "SubMenuName": "Expiring Subscription Report", "SubMenuUrl": "expiringsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "214", + "SubMenuId": "215", "SubMenuName": "New Subscription Report", "SubMenuUrl": "subscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "215", + "SubMenuId": "216", "SubMenuName": "Subscription Cancellation Report", "SubMenuUrl": "subscriptioncancellationreport", "SubMenuStatus": "False" }, { - "SubMenuId": "216", + "SubMenuId": "217", "SubMenuName": "Net AD Subscription Report", "SubMenuUrl": "netadsubscriptionreport", "SubMenuStatus": "False" }, { - "SubMenuId": "217", + "SubMenuId": "218", "SubMenuName": "Site License Usage Report", "SubMenuUrl": "sitelicenseusagereport", "SubMenuStatus": "False" }, { - "SubMenuId": "218", + "SubMenuId": "219", "SubMenuName": "Discount Code Report", "SubMenuUrl": "discountcodereport", "SubMenuStatus": "False" }, { - "SubMenuId": "219", + "SubMenuId": "220", "SubMenuName": "Image Export Report", "SubMenuUrl": "imageexportreport", "SubMenuStatus": "False" @@ -1412,7 +1455,7 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "220", + "SubMenuId": "221", "SubMenuName": "Add Building Level Account", "SubMenuUrl": "sitelicenseaccount", "SubMenuStatus": "False" @@ -1426,19 +1469,19 @@ "HeaderMenuStatus": "False", "SubMenu": [ { - "SubMenuId": "221", + "SubMenuId": "222", "SubMenuName": "View-Update Profile", "SubMenuUrl": "editlicensebasicsettings", "SubMenuStatus": "False" }, { - "SubMenuId": "222", + "SubMenuId": "223", "SubMenuName": "Manage Modesty Settings", "SubMenuUrl": "licensemodestysettings", "SubMenuStatus": "False" }, { - "SubMenuId": "223", + "SubMenuId": "224", "SubMenuName": "Manage Module", "SubMenuUrl": "licensemodulesettings", "SubMenuStatus": "False"