From ecc2c7ab3470f7bae01beaaaf0c9653c50ac8345 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 27 Jun 2022 14:36:03 +0300 Subject: [PATCH] worklist changes --- .../services/connector/connector.service.ts | 4 +- .../work-list-replacement-itg.component.html | 4 + .../work-list-replacement-itg.component.scss | 82 ++++++++++++++++--- .../work-list-replacement-itg.component.ts | 12 ++- .../work-list-replacement-roll.component.html | 9 +- .../work-list-replacement-roll.component.scss | 76 +++++++++++++---- .../work-list-replacement-roll.component.ts | 6 ++ .../app/profile/contact/contact.component.ts | 4 - 8 files changed, 158 insertions(+), 39 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 5a1959c6..f472cb49 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - // public static host = 'https://uat.hmgwebservices.com/'; - public static host = 'https://hmgwebservices.com/'; + public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index f54b721a..e9146fe8 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -170,6 +170,10 @@ +
+ {{searchKey}} +
+ diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index ac20567e..928c383a 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -31,6 +31,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; top: 0; } + .profileImage { width: 60px !important; } @@ -38,9 +39,11 @@ button.item-button.button.button-md.button-clear.button-clear-md { .activated { border: #209a83 0.02cm solid; } + .deactivated { border: #e4e4e4 0.02cm solid; } + .repContentDiv { text-align: center; width: 85%; @@ -51,6 +54,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin-top: -9px; margin-right: -35px; } + .selIEmpDiv { text-align: right; margin-bottom: -26px; @@ -70,6 +74,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { margin: 8px 17px 0px 17px; padding: 10px 2px 10px 2px; } + .filterInput { border: solid var(--gray) 1px; border-radius: 21px; @@ -88,6 +93,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-right: 129px; //margin-right: -136px; } + .filterBtn { background: var(--newgreen); --background: var (--newgreen); @@ -95,6 +101,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { height: 60px; width: 60px; } + .filterBtn-ar { // background: var(--newgreen); // --background: var (--newgreen); @@ -118,6 +125,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding: 8px; width: 100%; } + .square { // width:calc(100% / 2); width: 100%; @@ -150,18 +158,22 @@ button.item-button.button.button-md.button-clear.button-clear-md { position: relative; bottom: 4px; } + ion-radio { --color-checked: #269db8; } + .center { text-align: center; padding: 5px; } + .boldTxtNav { text-align: start; font-weight: bold; padding: 12px; } + .employee-details { display: inline-block; margin: 10px; @@ -169,15 +181,18 @@ ion-radio { white-space: nowrap; width: 70%; } + .empImgeRep { display: inline-block; height: 40px; width: 40px; } + .star-fav { float: right; margin: 15px 0px 0px 0px; } + .uk-margin { margin: 15px 15px 0px 15px; font-weight: bold; @@ -185,9 +200,11 @@ ion-radio { position: relative; top: 10px; } + .uk-padding { padding: 20px; } + .uk-padding .employee-details { bottom: 10px; position: relative; @@ -197,57 +214,86 @@ ion-radio { float: left; margin: 10px 5px; } + .top-radio-row { font-size: 12px; display: block; padding-bottom: 25px; padding-top: 15px; } + .textSearchType { padding-top: 8px; font-size: 12px; } + .isFavLetterActive { // background: #269db8; // width: 55px; // border-radius: 60px; color: #269db8; - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; } + .vl { border-left: 2px solid lightgray; height: 42px; } -.clearText{ + +.clearText { background: transparent; color: #D55D5C; font-weight: bold; text-decoration: underline; } -.searchText{ + +.searchText { background: transparent; color: #269db8; font-weight: bold; text-decoration: underline; } -.filterClass input{ + +.filterClass input { box-shadow: none !important; -webkit-box-shadow: none !important; } -.letterDiv{ - font-weight: bold; - width: 10%; +.letterDiv { + font-weight: bold; + width: 10%; float: right; } -.letterDivLoop{ - display: block; - width: 60%; - float: right; - transition-duration: 0ms; + +.letterDivLoop { + display: block; + width: 60%; + float: right; + transition-duration: 0ms; height: 35px; +} + +.square-selected { + box-shadow: 5px 2px 8px #ccc; + padding: 0px 10px 0px 10px; + margin: 0px 15px; + border-radius: 10px; + position: relative; + bottom: 20px; +} + +.square-selected img { + height: 20px; + width: 20px; + bottom: 3px; + position: relative; + +} + +.square-selected span { + white-space: normal; } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 0e2a6346..b65a3cbc 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -682,4 +682,10 @@ export class WorkListReplacementRollComponent implements OnInit { clearSearchInput() { this.inputSearch = ''; } + resetSelected() { + + this.inputSearch = ''; + this.userSelected = false; + + } } diff --git a/Mohem/src/app/profile/contact/contact.component.ts b/Mohem/src/app/profile/contact/contact.component.ts index e137b838..26f814b0 100644 --- a/Mohem/src/app/profile/contact/contact.component.ts +++ b/Mohem/src/app/profile/contact/contact.component.ts @@ -74,14 +74,10 @@ export class ConatactComponent implements OnInit { this.setIsDeletedStatus(); console.log(this.phoneNumbers); this.submitrequest = { - P_MENU_TYPE: this.selMenu.List_Menu.MENU_TYPE, P_SELECTED_RESP_ID: this.respID, //this.selMenu.List_Menu.RESP_ID,//-999, P_FUNCTION_NAME: this.selMenu.GetMenuEntriesList.FUNCTION_NAME, P_MBL_PHONES_TBL: this.phoneNumbers, - - - }; this.profileService.submitPhoneTransaction(this.submitrequest, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { if (this.cs.validResponse(response)) {