worklist changes

MOHEMM-Q3-DEV-LATEST
Sultan Khan 4 years ago
parent 09cebc6a82
commit ecc2c7ab34

@ -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,

@ -170,6 +170,10 @@
</ion-list>
<div class="square-selected" *ngIf="searchKey"><div class="profileImageDiv">
<ion-label class="employee-details sc-ion-label-ios-h sc-ion-label-ios-s ios hydrated"><span>{{searchKey}}</span></ion-label>
<div class="star-fav" ><img src="assets/imgs/close.svg" (click)="resetSelected()"></div></div></div>
<!-- <div style="font-weight: bold;" *ngIf="searchKeySelect === '4' && !isFavoriteLetterActive">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">

@ -7,34 +7,42 @@
position: relative;
bottom: 4px;
}
ion-radio {
--color-checked: #269db8;
}
.center {
text-align: center;
}
.boldTxtNav {
text-align: start;
font-weight: bold;
padding: 12px;
}
.employee-details {
display: inline-block;
margin: 10px;
}
.empImgeRep {
display: inline-block;
height: 40px;
width: 40px;
}
.star-fav {
float: right;
margin: 10px;
}
.star-fav-left {
float: left;
margin: 10px 5px;
}
.uk-margin {
margin: 15px 15px 0px 15px;
font-weight: bold;
@ -42,9 +50,11 @@ ion-radio {
position: relative;
top: 10px;
}
.uk-padding {
padding: 20px;
}
.uk-padding .employee-details {
bottom: 10px;
position: relative;
@ -55,18 +65,22 @@ ion-radio {
border-radius: 21px;
padding-left: 10px !important;
}
.filterInput-ar {
border: solid var(--gray) 1px;
border-radius: 21px;
--padding-start: 10px !important;
}
.square-container {
width: 100%;
clear: both;
}
.square {
clear: both;
}
.top-radio-row {
font-size: 12px;
}
@ -104,6 +118,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
position: relative;
top: 0;
}
.profileImage {
width: 60px !important;
}
@ -111,9 +126,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%;
@ -124,6 +141,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;
@ -143,6 +161,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;
@ -161,6 +180,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);
@ -168,6 +188,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
height: 60px;
width: 60px;
}
.filterBtn-ar {
// background: var(--newgreen);
// --background: var (--newgreen);
@ -191,6 +212,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
// padding: 8px;
width: 100%;
}
.square {
// width:calc(100% / 2);
width: 100%;
@ -223,17 +245,21 @@ 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 {
font-weight: bold;
padding: 5px;
}
.employee-details {
display: inline-block;
margin: 10px;
@ -241,15 +267,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;
@ -257,9 +286,11 @@ ion-radio {
position: relative;
top: 10px;
}
.uk-padding {
padding: 20px;
}
.uk-padding .employee-details {
bottom: 10px;
position: relative;
@ -275,6 +306,7 @@ ion-radio {
padding-bottom: 25px;
padding-top: 15px;
}
.textSearchType {
padding-top: 8px;
font-size: 12px;
@ -282,32 +314,56 @@ ion-radio {
.isFavLetterActive {
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;
}
.searchText{
.searchText {
background: transparent;
color: #269db8;
font-weight: bold;
text-decoration: underline;
}
.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;
}

@ -48,7 +48,7 @@ export class WorkListReplacementItgComponent implements OnInit {
spaceBetween: 5
};
public activeSelectedLetter:string;
public activeSelectedLetter: string;
constructor(public vacationRuleService: VacationRuleServiceService,
public ts: TranslatorService,
@ -368,7 +368,7 @@ export class WorkListReplacementItgComponent implements OnInit {
this.selectedLetter(this.activeSelectedLetter);
} else {
this.favLetter.forEach((obj, index) => {
if(this.activeSelectedLetter) {}
if (this.activeSelectedLetter) { }
if (index === 0) {
// this.selectedLetter(obj);
this.favIsActive.push(true);
@ -446,7 +446,7 @@ export class WorkListReplacementItgComponent implements OnInit {
if (letter === el) {
this.favIsActive[index] = true;
this.activeSelectedLetter = el;
this.worklistService.getFavoriteByLetter(letter,() => {
this.worklistService.getFavoriteByLetter(letter, () => {
}).subscribe((result) => {
if (this.cs.validResponse(result)) {
this.cs.stopLoading();
@ -466,4 +466,10 @@ export class WorkListReplacementItgComponent implements OnInit {
returnIsActiveFunction(i) {
return this.favIsActive[i];
}
resetSelected() {
this.searchKey = '';
this.userSelected = false;
}
}

@ -90,7 +90,7 @@
<ion-row>
<ion-col size="7">
<div *ngIf="isFilter" style="height: 0px;">
<ion-searchbar style="padding-top: 1px;" class="filterClass" mode='md' (ionInput)="filterList($event)" placeholder="Filter">
<ion-searchbar [(ngModel)]="inputSearch" style="padding-top: 1px;" class="filterClass" mode='md' (ionInput)="filterList($event)" placeholder="Filter">
</ion-searchbar>
</div>
<ion-input *ngIf="!isFilter" class='replacmentSearchBar' clearInput="true"
@ -125,7 +125,12 @@
</ion-row>
</ion-grid>
</ion-list>
<div class="square-selected" *ngIf="inputSearch"><div class="profileImageDiv">
<ion-label class="employee-details sc-ion-label-ios-h sc-ion-label-ios-s ios hydrated"><span>{{inputSearch}}</span></ion-label>
<div class="star-fav" ><img src="assets/imgs/close.svg" (click)="resetSelected()"></div></div></div>
<div class="letterDiv" *ngIf="searchBy === '4' && !isFavoriteLetterActive && !userSelected">
<!-- <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> -->

@ -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;
}

@ -682,4 +682,10 @@ export class WorkListReplacementRollComponent implements OnInit {
clearSearchInput() {
this.inputSearch = '';
}
resetSelected() {
this.inputSearch = '';
this.userSelected = false;
}
}

@ -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)) {

Loading…
Cancel
Save