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 a280baed..56bd2ff0 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -309,7 +309,8 @@ export class AuthenticationService { user.CompanyImageDescription=result.CompanyImageDescription; user.CompanyImageURL=result.CompanyImageURL; user.LogInTokenID = this.cs.sharedService.getSharedData( - AuthenticationService.LOGIN_DATA + AuthenticationService.LOGIN_DATA, + false ).LogInTokenID; return user; } diff --git a/Mohem/src/app/my-specialist/home/home.component.html b/Mohem/src/app/my-specialist/home/home.component.html index b8d3c5ce..6afbcf3b 100644 --- a/Mohem/src/app/my-specialist/home/home.component.html +++ b/Mohem/src/app/my-specialist/home/home.component.html @@ -23,7 +23,7 @@ - + diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts index 9d1e8f70..ce0666c4 100644 --- a/Mohem/src/app/uI-elements/select.input.ts +++ b/Mohem/src/app/uI-elements/select.input.ts @@ -26,7 +26,6 @@ export class SelectInput extends UiElement { "
" + "" + "" + "
"; diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index cde1b933..d20f5282 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -7,8 +7,8 @@ -
-
+ +
diff --git a/Mohem/src/app/vacation-rule/home/home.component.ts b/Mohem/src/app/vacation-rule/home/home.component.ts index 1f3a6826..0b0607ad 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.ts +++ b/Mohem/src/app/vacation-rule/home/home.component.ts @@ -37,7 +37,7 @@ export class HomeComponent implements OnInit { this.P_PAGE_NUM = 1; this.P_PAGE_LIMIT = 50; - this.button = new ButtonInput('btnSubmit', 'Submit', 'containerDiv', 'Y'); + //this.button = new ButtonInput('btnSubmit', 'Submit', 'containerDiv', 'Y'); // this.dateTime = new DateTimeInput('Start Date', 'SDate', '', 'containerDiv', 'Y', 'Y', 'Y'); // this.date = new DateInput('Start Date', 'SDate', '', 'containerDiv', 'Y', 'Y', 'Y'); // this.numberInput = new NumberInput('Roll No.:', 'rollNo', '', 'containerDiv', 'Y', 'Y', 'Y'); @@ -56,11 +56,11 @@ export class HomeComponent implements OnInit { this.getVacationRules(); // let elem = document.getElementById('btnSubmit'); - const elemDiv = document.createElement('div'); + // const elemDiv = document.createElement('div'); // elemDiv.id = this.elementID; - elemDiv.className = ''; + // elemDiv.className = ''; - elemDiv.innerHTML = this.button.getTemplate(); + //elemDiv.innerHTML = this.button.getTemplate(); // elemDiv.innerHTML = this.dateTime.getTemplate(); // elemDiv.innerHTML = this.date.getTemplate(); // elemDiv.innerHTML = this.numberInput.getTemplate(); @@ -68,14 +68,14 @@ export class HomeComponent implements OnInit { // elemDiv.innerHTML = this.textAreaInput.getTemplate(); // elemDiv.innerHTML = this.timeInput.getTemplate(); - document.getElementById('containerDiv').appendChild(elemDiv); + //document.getElementById('containerDiv').appendChild(elemDiv); - let elem = document.getElementById("btnSubmit"); + // let elem = document.getElementById("btnSubmit"); // console.log(elem); - elem.addEventListener("click", (e) => { - this.showAlert(); - e.stopImmediatePropagation(); - }); + // elem.addEventListener("click", (e) => { + // this.showAlert(); + // e.stopImmediatePropagation(); + // }); }