From e4019c5608beae544bd708ff21d6160b01c3df1a Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sat, 29 Oct 2022 17:19:50 +0300 Subject: [PATCH] IMPLEMENTED NEW DEV FOR MOE --- .../submit-absence.component.ts | 30 ++++--- Mohem/src/app/app.component.ts | 1 - .../src/app/eit/add-cei/add-cei.component.ts | 30 ++++--- .../src/app/eit/add-eit/add-eit.component.ts | 42 ++++++--- .../confirm-add-eit.component.html | 6 +- .../confirm-add-eit.component.scss | 3 +- .../confirm-add-eit.component.ts | 4 + .../app/eit/eit-list/eit-list.component.html | 3 + .../app/eit/eit-list/eit-list.component.scss | 6 ++ .../services/common/common.service.ts | 24 ++++- .../services-button.component.html | 2 +- Mohem/src/app/home/home.page.ts | 9 ++ .../add-address/add-address.component.ts | 30 ++++--- .../add-basic-details.component.ts | 42 ++++++--- .../add-update-contact.component.ts | 42 ++++++--- .../confirm-address.component.html | 5 +- .../confirm-address.component.ts | 4 +- .../confirm-basic-details.component.html | 5 +- .../confirm-basic-details.component.ts | 4 + .../confirm-contact.component.html | 5 +- .../confirm-contact.component.ts | 4 + .../performance-evaluation.component.html | 82 +++++++----------- .../performance-evaluation.component.scss | 7 +- .../performance-evaluation.component.ts | 5 +- .../concurrent-report.component.html | 9 +- .../concurrent-report.component.ts | 56 ++++++++---- .../transaction-list.component.ts | 2 +- .../transactions/transactions.component.ts | 2 +- .../termination-form.component.ts | 42 ++++++--- Mohem/src/app/uI-elements/date-time.input.ts | 12 ++- Mohem/src/app/uI-elements/date.input.ts | 12 ++- Mohem/src/app/uI-elements/number.input.ts | 10 ++- Mohem/src/app/uI-elements/select.input.ts | 17 ++-- Mohem/src/app/uI-elements/text.input.ts | 11 ++- Mohem/src/app/uI-elements/time.input.ts | 10 ++- Mohem/src/app/uI-elements/ui-element.ts | 3 +- .../create-vacation-rule.component.ts | 8 +- .../vacation-type/vacation-type.component.ts | 8 +- Mohem/src/assets/imgs/defaultService.png | Bin 0 -> 661 bytes Mohem/src/theme/styles.scss | 27 +++++- 40 files changed, 422 insertions(+), 202 deletions(-) create mode 100644 Mohem/src/assets/imgs/defaultService.png diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 159c4842..463eb444 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -322,7 +322,8 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -333,7 +334,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -352,7 +354,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -363,7 +366,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -382,7 +386,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -393,7 +398,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -423,7 +429,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -434,7 +441,8 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -448,7 +456,8 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -458,7 +467,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index ebc17258..123d10ef 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -152,7 +152,6 @@ export class AppComponent implements OnInit { if (user) { console.log(user); this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); - console.log('ENAD TEST') console.log(this.userInfo) localStorage.setItem("digitalIDUser", JSON.stringify(user)); this.digitalIDUser = user//JSON.stringify(user); diff --git a/Mohem/src/app/eit/add-cei/add-cei.component.ts b/Mohem/src/app/eit/add-cei/add-cei.component.ts index 8d9ef1f6..498ced4b 100644 --- a/Mohem/src/app/eit/add-cei/add-cei.component.ts +++ b/Mohem/src/app/eit/add-cei/add-cei.component.ts @@ -177,7 +177,8 @@ export class AddCeiComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql // this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -192,7 +193,8 @@ export class AddCeiComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ // this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -214,7 +216,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -225,7 +228,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date @@ -251,7 +255,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -262,7 +267,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -297,7 +303,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -308,7 +315,8 @@ export class AddCeiComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -322,7 +330,8 @@ export class AddCeiComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { // dropdown list missing open in differnt page @@ -335,7 +344,8 @@ export class AddCeiComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else{ // this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED); 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 11b1b446..0a7e5666 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -181,7 +181,8 @@ export class AddEitComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql // this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -196,7 +197,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ // this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); @@ -218,7 +220,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -229,7 +232,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP, ); } // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date @@ -255,7 +259,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -266,7 +271,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -301,7 +307,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -312,7 +319,8 @@ export class AddEitComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -326,7 +334,8 @@ export class AddEitComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { // dropdown list missing open in differnt page @@ -339,7 +348,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); // }else{ // this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED); @@ -391,6 +401,8 @@ export class AddEitComponent implements OnInit { if (this.validateEitObj && this.validateEitObj.length > 0) { this.fillEITStructure(); } + + this.bindToolTip(); } addFieldToDOM( @@ -530,6 +542,16 @@ export class AddEitComponent implements OnInit { } } + bindToolTip () { + const toolTips = Array.from(document.getElementsByClassName('toolTip')); + toolTips.forEach(toolTip => { + toolTip.addEventListener('click', e => { + const toolTipData = toolTip.getAttribute("data-tooltip"); + this.cs.yellowToast(toolTipData); + }); + }); + } + bindHtmlElemEvents(id, obj) { const elem = document.getElementById(id); console.log(elem); diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index 87e43eea..54434973 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -16,7 +16,11 @@ -
{{'general, addAttach' | translate}} *
+
+ {{'general, addAttach' | translate}} + * +
+
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index 123edc99..7af90016 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -268,4 +268,5 @@ .fileDiv-ar { float: left; -} \ No newline at end of file +} + diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index a937b67e..268f326d 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -569,5 +569,9 @@ export class ConfirmAddEitComponent implements OnInit { // } + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } + } diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index b4296b7f..8e197250 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -181,6 +181,9 @@

{{'general, noData' | translate}}

+
+

{{getPassMnuEntryObj.REQ_TIP}}

+
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index 732b32a6..2fcf60d0 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -344,4 +344,10 @@ z-index: 1; height: 20px; float: left; margin-top: 20px; + } + + .terms { + text-align: center; + color: #004D71; + font-weight: bold; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index f41e90e8..6be358f7 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -243,6 +243,19 @@ export class CommonService { }); toast.present(); } + + async yellowToast(message: string) { + const toast = await this.toastController.create({ + message: message, + showCloseButton: true, + position: 'top', + duration: 3000, + color: 'warning', + closeButtonText: this.ts.trPK('general', 'close') + }); + toast.present(); + } + async greenToast(message: string) { const toast = await this.toastController.create({ message: message, @@ -1192,7 +1205,6 @@ export class CommonService { this.nav.navigateForward(['/eit/homepage']); } public openMyTeamPage() { - console.log('someeeeeeee'); this.nav.navigateForward(['/my-team/home']); } public openMyTeamDetailPage() { @@ -1350,9 +1362,13 @@ export class CommonService { public openAnnouncement() { this.nav.navigateForward(['/backend-integrations/announcement']); } - public openConcurrentReport() { - - this.nav.navigateForward(['/reports/concurrent-report']); + public openConcurrentReport(value: boolean) { + const navigationExtras: NavigationExtras = { + queryParams: { + fromHome: value + } + }; + this.nav.navigateForward(['/reports/concurrent-report'], navigationExtras); } public openConcurrentTransaction() { diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html index 0fa0da32..3b722cec 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html @@ -1,6 +1,6 @@
- + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 4e1de840..242c674c 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -818,6 +818,11 @@ export class HomePage implements OnInit { this.common.openProfile('contact'); } else if (subMenu.REQUEST_TYPE === 'CONTACT') { this.common.openProfile('family'); + } else if (subMenu.REQUEST_TYPE === 'PAR') { + this.performanceEvaluation(); + } else if (subMenu.REQUEST_TYPE === 'CCP') { + this.common.sharedService.setSharedData(subMenu, MenuResponse.SELECTED_MENU); + this.common.openConcurrentReport(true); } if (subMenu.REQUEST_TYPE === 'TIME_CARD') { this.common.openTimeCardPage(); @@ -911,4 +916,8 @@ export class HomePage implements OnInit { openAnnouncement() { this.common.openAnnouncement(); } + + public performanceEvaluation() { + this.common.openPerformanceevaluation(); + } } diff --git a/Mohem/src/app/profile/add-address/add-address.component.ts b/Mohem/src/app/profile/add-address/add-address.component.ts index cfd2ffc8..b5bdf39f 100644 --- a/Mohem/src/app/profile/add-address/add-address.component.ts +++ b/Mohem/src/app/profile/add-address/add-address.component.ts @@ -160,7 +160,8 @@ export class AddAddressComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -171,7 +172,8 @@ export class AddAddressComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -190,7 +192,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -201,7 +204,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -220,7 +224,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -231,7 +236,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -253,7 +259,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -264,7 +271,8 @@ export class AddAddressComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -278,7 +286,8 @@ export class AddAddressComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -288,7 +297,8 @@ export class AddAddressComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts index 021ffa80..d3c9a15f 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts @@ -199,7 +199,8 @@ export class AddBasicDetailsComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { this.selectInput = new SelectInput( @@ -209,7 +210,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillStaticDropdownList( feildsList[i].SEGMENT_NAME, @@ -224,7 +226,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "DATE" && this.targetValue === 'new') { this.dateInput = new DateInput( @@ -235,7 +238,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } @@ -398,7 +402,8 @@ export class AddBasicDetailsComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList.REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { this.numberInput = new NumberInput( @@ -408,7 +413,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -427,7 +433,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -438,7 +445,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -457,7 +465,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -468,7 +477,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -490,7 +500,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -501,7 +512,8 @@ export class AddBasicDetailsComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -515,7 +527,8 @@ export class AddBasicDetailsComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -525,7 +538,8 @@ export class AddBasicDetailsComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, diff --git a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts index f8aaf42a..557c5762 100644 --- a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts +++ b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts @@ -232,7 +232,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { this.selectInput = new SelectInput( @@ -242,7 +243,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillStaticDropdownList( feildsList[i].SEGMENT_NAME, @@ -257,7 +259,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "DATE") { this.dateInput = new DateInput( @@ -268,7 +271,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } @@ -429,7 +433,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { this.numberInput = new NumberInput( @@ -439,7 +444,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -458,7 +464,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -469,7 +476,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -488,7 +496,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -499,7 +508,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -521,7 +531,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -532,7 +543,8 @@ export class AddUpdateContactComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -546,7 +558,8 @@ export class AddUpdateContactComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -556,7 +569,8 @@ export class AddUpdateContactComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); if (isDff) { this.fillDropdownListDff( diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.html b/Mohem/src/app/profile/confirm-address/confirm-address.component.html index d6184c4d..d8729066 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.html +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.html @@ -16,7 +16,10 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} +
+
diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts index d52f92ae..1aad90d3 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts @@ -605,6 +605,8 @@ export class ConfirmAddressComponent implements OnInit { // } - + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } } diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html index ab23e2d4..1982d4fc 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html @@ -17,7 +17,10 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} +
+
diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts index 92e8da0b..72a562ed 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts @@ -436,5 +436,9 @@ export class ConfirmBasicDetailsComponent implements OnInit { } } + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } + } diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html index 0505227b..9bf91b79 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html @@ -11,7 +11,10 @@ -
{{'general, addAttach' | translate}}
+
+ {{'general, addAttach' | translate}} +
+
diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts index 67113d42..f7aa0922 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts @@ -437,4 +437,8 @@ export class ConfirmContactComponent implements OnInit { } } + showToolTip(toolTip: any) { + this.cs.yellowToast(toolTip); + } + } diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 716539d2..d487b22e 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -5,63 +5,39 @@
- - -
- -
- - - - - -
- -

{{ts.trPK('userProfile','performance-evaluation')}}

- -
- - - - - - - + +
+ +

{{ts.trPK('userProfile','performance-evaluation')}}

+ +
+ + +
+
- -
- - -
-
-
- - -
-
- - -
- - -
-
+
+ + +
+
+ + +
+ + +
+
+
-
- - - - - -
+ - \ No newline at end of file diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index 40236e9b..5b7db500 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -168,16 +168,19 @@ } .gauge{ - // transform: translate(-24px, -65px); margin-bottom: -140px; margin-top: -70px; - + position: relative; + right: 15px; } + .gauge-ar{ transform: translate(-24px, -65px); margin-bottom: -187px; margin-top: -20px; margin-right: -56px; + position: relative; + right: 15px; } diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index 6b146f85..bbbc6700 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -107,7 +107,10 @@ export class PerformanceEvaluationComponent implements OnInit { this.appraisalArr = result.GetPerformanceAppraisalList; this.performanceData = []; for (let i = 0; i < this.appraisalArr.length; i++) { - this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseInt(this.appraisalArr[i].APPRAISAL_SCORE).toFixed() }); + if (!this.appraisalArr[i].APPRAISAL_SCORE) { + this.appraisalArr[i].APPRAISAL_SCORE = 0; + } + this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseFloat(this.appraisalArr[i].APPRAISAL_SCORE)}); } console.log('PerformanceAppraisalResponse'); this.cs.sharedService.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html index 75fc66f0..5963fb78 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html @@ -8,7 +8,7 @@
- + {{ 'worklist,template-name' | translate}} @@ -16,6 +16,13 @@ {{ program.USER_CONCURRENT_PROGRAM_NAME}} + + + {{ 'worklist,template-name' | translate}} + + + {{ selectedMenu.PROMPT}} +
diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts index 85715324..07c0f866 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts @@ -15,6 +15,7 @@ import { TextInput } from 'src/app/uI-elements/text.input'; import { TimeInput } from 'src/app/uI-elements/time.input'; import { ReportServiceService } from '../report-service.service'; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'app-concurrent-report', @@ -40,10 +41,11 @@ export class ConcurrentReportComponent implements OnInit { public selEmp; public eitRequest; public ExtraObj; - selMenu: MenuResponse; public functionName; public userData: any; + public fromHome: any = false; + public headerTitle; @@ -54,16 +56,26 @@ export class ConcurrentReportComponent implements OnInit { comtransNo: any = 1; programList: any = []; public template: any; - constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService) { } + constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService, public router: ActivatedRoute) { + this.router.queryParams.subscribe(params => { + console.log(params) + this.fromHome = params.fromHome; + }); + } ngOnInit() { this.userData =this.cs.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); this.getPassdirfromNotifiPage = this.cs.sharedService.getSharedData('dirfromNotificationPage'); this.selectedMenu = this.cs.sharedService.getSharedData(MenuResponse.SELECTED_MENU, false); - this.getConcurrentProgram(); + this.functionName = this.selectedMenu.FUNCTION_NAME; + + if (this.fromHome == "false") { + this.getConcurrentProgram(); + } else { + this.getCppDiffStructure(this.functionName); + } this.direction = TranslatorService.getCurrentLanguageName(); // this.effectiveDate = new Date(); - this.functionName = this.selectedMenu.FUNCTION_NAME; // this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; } getConcurrentProgram() { @@ -80,7 +92,7 @@ export class ConcurrentReportComponent implements OnInit { getCppDiffStructure(programList) { this.cs.startLoading(); this.reports.getCPPDiffStructure({ - P_DESC_FLEX_NAME: programList.CONCURRENT_PROGRAM_NAME, + P_DESC_FLEX_NAME: this.fromHome == "false" ? programList.CONCURRENT_PROGRAM_NAME : programList, P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { this.cs.stopLoading(); @@ -123,7 +135,8 @@ export class ConcurrentReportComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -134,7 +147,8 @@ export class ConcurrentReportComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -153,7 +167,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -164,7 +179,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -183,7 +199,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -194,7 +211,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -216,7 +234,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -227,7 +246,8 @@ export class ConcurrentReportComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -241,7 +261,8 @@ export class ConcurrentReportComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -251,7 +272,8 @@ export class ConcurrentReportComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, @@ -933,7 +955,7 @@ export class ConcurrentReportComponent implements OnInit { this.eitRequest.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; this.eitRequest.P_SELECTED_RESP_ID = -999;// this.selectedMenu.RESP_ID; // this.selMenu.List_Menu.RESP_ID,//-999, this.eitRequest.P_FUNCTION_NAME = this.functionName; - this.eitRequest.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + this.eitRequest.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName; // this.reportSubmitRequest = {} this.cs.startLoading(); this.reports @@ -961,7 +983,7 @@ export class ConcurrentReportComponent implements OnInit { request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; request.P_SELECTED_RESP_ID = -999; request.P_FUNCTION_NAME = this.functionName; - request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + request.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName; request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; diff --git a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts index 957f0b58..9f23766a 100644 --- a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts +++ b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts @@ -98,7 +98,7 @@ export class TransactionListComponent implements OnInit { request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE; request.P_SELECTED_RESP_ID = -999; request.P_FUNCTION_NAME = this.selectedMenu.FUNCTION_NAME; - request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME; + request.P_DESC_FLEX_NAME = this.template != undefined ? this.template.CONCURRENT_PROGRAM_NAME: this.selectedMenu.FUNCTION_NAME; request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER; this.reports.getTransaction(request, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => { diff --git a/Mohem/src/app/reports/transactions/transactions.component.ts b/Mohem/src/app/reports/transactions/transactions.component.ts index 42bb0d87..38cea1ee 100644 --- a/Mohem/src/app/reports/transactions/transactions.component.ts +++ b/Mohem/src/app/reports/transactions/transactions.component.ts @@ -130,6 +130,6 @@ export class TransactionsComponent implements OnInit { } } createTransaction() { - this.cs.openConcurrentReport(); + this.cs.openConcurrentReport(false); } } diff --git a/Mohem/src/app/termination/termination-form/termination-form.component.ts b/Mohem/src/app/termination/termination-form/termination-form.component.ts index a874077e..4d348f2f 100644 --- a/Mohem/src/app/termination/termination-form/termination-form.component.ts +++ b/Mohem/src/app/termination/termination-form/termination-form.component.ts @@ -129,7 +129,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -140,7 +141,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -159,7 +161,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.dateInput = new DateInput( @@ -170,7 +173,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -189,7 +193,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.datetimeInput = new DateTimeInput( @@ -200,7 +205,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } const elem = document.getElementById( @@ -222,7 +228,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } else { this.timeInput = new TimeInput( @@ -233,7 +240,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } } @@ -247,7 +255,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else { this.selectInput = new SelectInput( @@ -257,7 +266,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillDropdownList( feildsList[i].SEGMENT_NAME, @@ -1288,7 +1298,8 @@ export class TerminationFormComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) { this.selectInput = new SelectInput( @@ -1298,7 +1309,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); this.fillStaticDropdownList( feildsList[i].SEGMENT_NAME, @@ -1313,7 +1325,8 @@ export class TerminationFormComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + feildsList[i].REQ_COL_TIP ); } else if (feildsList[i].DATATYPE == "DATE") { this.dateInput = new DateInput( @@ -1324,7 +1337,8 @@ export class TerminationFormComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction + this.direction, + feildsList[i].REQ_COL_TIP ); } diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index 05e63bad..dd467f8d 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -9,7 +9,8 @@ export class DateTimeInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -21,6 +22,7 @@ export class DateTimeInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; let disaledClass = ""; @@ -33,6 +35,9 @@ export class DateTimeInput extends UiElement { } if (this.required == 'Y') requiredClass = "requiredClass" + + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + // let arrayDate=val.split(" "); // elem.value = this.common.reverseFormatDate(arrayDate[0]); // elem.setAttribute('value', elem.value); @@ -45,13 +50,14 @@ export class DateTimeInput extends UiElement { // timeValue=arrayDate[1]; // } const template = - "" + + "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ + "
" + "
" return template; } diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index c0f7b0a6..0261d3af 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -9,7 +9,8 @@ export class DateInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); } @@ -23,6 +24,7 @@ export class DateInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } @@ -36,19 +38,23 @@ export class DateInput extends UiElement { } if (this.required == 'Y') requiredClass = "requiredClass" + + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + const template = // "
" + // " " + // " "+ // "
"; - "" + + "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ + "
" + "
" return template; diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts index e8b68ee9..324af9f0 100644 --- a/Mohem/src/app/uI-elements/number.input.ts +++ b/Mohem/src/app/uI-elements/number.input.ts @@ -8,7 +8,8 @@ export class NumberInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -16,19 +17,22 @@ export class NumberInput extends UiElement { public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} const template = // "
" + // " " + // " " + // "
"; - " " + + " " + "" + this.label + "" + - " " + + " " + + "
" + "
"; return template; diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts index b2f1f756..715c6d1c 100644 --- a/Mohem/src/app/uI-elements/select.input.ts +++ b/Mohem/src/app/uI-elements/select.input.ts @@ -11,7 +11,8 @@ export class SelectInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.direction = TranslatorService.getCurrentLanguageName(); this.createElement(this.getTemplate()); @@ -21,12 +22,14 @@ export class SelectInput extends UiElement { public getTemplate() { let template :string = ""; + let hideToolTipClass: string = ""; let requiredClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } - // const template = + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} + // const template = // "
" + // " " + // " "+ + " "+ + "
" + "
"; } else{ template = - "
" + + "
" + " " + - " "+ ""+ ""+ + "
" + "
"; } diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 985563b4..347d9aa9 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -1,6 +1,5 @@ import { UiElement } from "./ui-element"; - export class TextInput extends UiElement { constructor( @@ -11,22 +10,26 @@ export class TextInput extends UiElement { private textVal: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); } public getTemplate() { let requiredClass: string = ""; + let hideToolTipClass: string = ""; if (this.required === 'Y') requiredClass = "requiredClass" if (this.disabled === "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden === "N") { this.hidden = "display:none;" } else { this.hidden = "" } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"} const template = // "
" + - "" + + "" + " " + this.label + "" + - " " + + " " + + "
" + "
"; return template; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index a8d156fa..d61b5ccd 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -10,7 +10,8 @@ export class TimeInput extends UiElement { private disabled: string, private hidden: string, private required: string, - private language: string = 'en') { + private language: string = 'en', + private toolTipText: string) { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -26,6 +27,7 @@ export class TimeInput extends UiElement { public getTemplate() { let requiredClass = ''; + let hideToolTipClass: string = ""; let disaledClass = ''; const doneText = this.language === 'en' ? 'Done' : 'تم'; const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; @@ -39,11 +41,13 @@ export class TimeInput extends UiElement { if (this.value === 'currentTime') { this.formatDate(); } + if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}; const template = - "" + + "" + " " + this.label + "" + - "" + + "" + + "
" + "
" return template; } diff --git a/Mohem/src/app/uI-elements/ui-element.ts b/Mohem/src/app/uI-elements/ui-element.ts index 2d7ec8f8..4101e54c 100644 --- a/Mohem/src/app/uI-elements/ui-element.ts +++ b/Mohem/src/app/uI-elements/ui-element.ts @@ -24,11 +24,12 @@ export class UiElement { } } + + public onClicked(listener: any) { this.registerEvent('click', listener); } - public onChanged(listener: any) { this.registerEvent('change', listener); } diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts index 0e844ddc..6adc2342 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts @@ -503,22 +503,22 @@ export class CreateVacationRuleComponent implements OnInit { if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") { console.log("1"); - this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", ""); + this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList.REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") { console.log("2"); //call create WF_LOOKUP //call there or when the got response from responsedAtt - this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList[i].REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); - this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); } } } diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts index acc38009..5e3a8869 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts @@ -414,22 +414,22 @@ createVacationDynamicFields(RespondAttributesList) { if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") { console.log("1"); - this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", ""); + this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList[i].REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") { console.log("2"); //call create WF_LOOKUP //call there or when the got response from responsedAtt - this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList.REQ_COL_TIP); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); - this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP); } } } diff --git a/Mohem/src/assets/imgs/defaultService.png b/Mohem/src/assets/imgs/defaultService.png new file mode 100644 index 0000000000000000000000000000000000000000..61b3b356c6e639666750d8b4fd38d315108d78c4 GIT binary patch literal 661 zcmV;G0&4w{QAyhR{m4jzn_x$0w6t!RlOY)e#d$uhWiE-FD@LTNM*Z1-15ihgl-vu@_H%*e9 zIV3b=I}U!~WN=1o302wcjrN&|<}yQ)t5YSNa@WOPX23GTqU!vty-)*TtG3|_H68{5 zPolk0LlZ|ZH&@r%+H8A*^&mf2R}ftIl%zi_w%90Op`ca3Lcv18`4!-N@c(?0label { margin-bottom: 20px; } +.ion-item-position { + position: relative; +} + .daynamicForm-Label { font-size: 16px; @@ -1975,4 +1979,25 @@ ion-app[dir="rtl"] { .float-left-moe { float: left; -} \ No newline at end of file +} + +[dir="ltr"] .toolTip { + position: absolute; + right: 20px; + top: 20px; + z-index: 999; +} + +[dir="rtl"] .toolTip { + position: absolute; + left: 20px; + top: 20px; + z-index: 999; +} + +.toolTip-inside { + position: absolute; + left: 48%; + top: 10%; + z-index: 999; + }