diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index b275dc11..9df7e342 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -556,24 +556,6 @@ export class AddEitComponent implements OnInit { }); } - scrollTopMOE(event: any) { - let total = 0; - let container = null; - - const _rec = (obj) => { - - total += obj.offsetTop; - const par = obj.offsetParent; - if (par && par.localName !== 'ion-content') { - _rec(par); - } else { - container = par; - } - } - _rec(event.target); - container.scrollToPoint(0, total - 50, 400); - } - bindHtmlElemEvents(id, obj) { const elem = document.getElementById(id); console.log(elem); @@ -593,10 +575,6 @@ export class AddEitComponent implements OnInit { // isEmpty=true; //emptyChildElement - if (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C") { - this.scrollTopMOE(e); - } - if (obj.FORMAT_TYPE == "N") { const maxSize = obj.MAXIMUM_SIZE; const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; @@ -1325,6 +1303,7 @@ export class AddEitComponent implements OnInit { } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { @@ -1356,6 +1335,7 @@ export class AddEitComponent implements OnInit { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) { x.classList.add("requiredClassElm"); + this.cs.redToastPK("eit", "required-text"); //this.common.showRequiredMsg(); return false; } else { diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index e6e24a52..67a0f480 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -588,7 +588,6 @@ export class AuthenticationService { public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable { this.authenticateRequest(request); request.UserName = localStorage.getItem("user"); - request.TokenID = '@dm!n'; if (isPostNoLoad) { return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); } else { diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 6e5e0e75..50fa47a3 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -64,7 +64,7 @@ {{ts.trPK('myTeam','profile-details')}} - +