ADAM / AIAHTML5

Commit bbbcf6d287b8ff576dfe3f8484f20ba223435b22

Authored by Birendra
1 parent 39199192

Client admin issue fixed

Inline Side-by-side
Showing 4 changed files with 12 additions and 9 deletions
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
  View file @bbbcf6d
@@ -104,7 +104,8 @@ export class SiteLicenseUsageReport implements OnInit { @@ -104,7 +104,8 @@ export class SiteLicenseUsageReport implements OnInit {
104 iLoginTypeId:[0] 104 iLoginTypeId:[0]
105 }); 105 });
106 if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") { 106 if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") {
107 - this.SiteLicenseUsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber) 107 + this.SiteLicenseUsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber);
  108 + this.SearchField.sAccountNumber=this.global.AccountNumber;
108 this.DisableAccountNumberControl = true; 109 this.DisableAccountNumberControl = true;
109 } 110 }
110 this.GetEdition(); 111 this.GetEdition();
400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
  View file @bbbcf6d
@@ -112,7 +112,8 @@ export class UsageReport implements OnInit, AfterViewChecked { @@ -112,7 +112,8 @@ export class UsageReport implements OnInit, AfterViewChecked {
112 iCountry: [0] 112 iCountry: [0]
113 }); 113 });
114 if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") { 114 if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") {
115 - this.UsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber) 115 + this.UsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber);
  116 + this.SearchField.sAccountNumber=this.global.AccountNumber;
116 this.DisableAccountNumberControl = true; 117 this.DisableAccountNumberControl = true;
117 } 118 }
118 this.alerts = ''; 119 this.alerts = '';
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
  View file @bbbcf6d
@@ -156,7 +156,8 @@ export class UsersList implements OnInit, AfterViewChecked { @@ -156,7 +156,8 @@ export class UsersList implements OnInit, AfterViewChecked {
156 { 156 {
157 if(this.global.AccountNumber !=undefined && this.global.AccountNumber !="") 157 if(this.global.AccountNumber !=undefined && this.global.AccountNumber !="")
158 { 158 {
159 - this.Users.controls['AccountNumber'].setValue(this.global.AccountNumber) 159 + this.Users.controls['AccountNumber'].setValue(this.global.AccountNumber);
  160 + this.SearchField.AccountNumber=this.global.AccountNumber;
160 this.DisableAccountNumberControl = true; 161 this.DisableAccountNumberControl = true;
161 } 162 }
162 163
400-SOURCECODE/Admin/src/app/shared/Pager/pager.component.html
  View file @bbbcf6d
1 <div class="row"> 1 <div class="row">
2 - <div class="col-sm-3"> 2 + <div class="col-md-4 col-sm-3">
3 <div class="form-inline marginTop20"> 3 <div class="form-inline marginTop20">
4 <div class="form-group"> 4 <div class="form-group">
5 <label for="PerPage">Item's Per Page</label> 5 <label for="PerPage">Item's Per Page</label>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
15 - <div class="col-sm-5"> 15 + <div class="col-md-5 col-sm-5">
16 <nav aria-label="..."> 16 <nav aria-label="...">
17 <ul class="pagination pagination-sm margin-btm0" (click)="PageNumberChange($event.target)"> 17 <ul class="pagination pagination-sm margin-btm0" (click)="PageNumberChange($event.target)">
18 <li [ngClass]="(pageShowList[0] == 1 ? 'disabled' : '')"> 18 <li [ngClass]="(pageShowList[0] == 1 ? 'disabled' : '')">
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
40 </li> 40 </li>
41 </ul> 41 </ul>
42 </nav> 42 </nav>
43 - </div>  
44 - <div class="col-sm-4"> 43 + </div>
  44 + <div class="col-md-3 col-sm-4">
45 <div class="form-inline marginTop20"> 45 <div class="form-inline marginTop20">
46 <div class="form-group"> 46 <div class="form-group">
47 <label for="Page"> 47 <label for="Page">
@@ -56,5 +56,5 @@ @@ -56,5 +56,5 @@
56 </select> 56 </select>
57 </div> 57 </div>
58 </div> 58 </div>
59 - </div>  
60 - </div> 59 + </div>
  60 +</div>