+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
index 0187d5a3..31ba8d46 100644
--- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
+++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss
@@ -2,7 +2,18 @@ ion-item {
margin-top: 5%;
margin-right: 7%;
}
-
+.labelRep{
+ --color: initial;
+ display: block;
+ color: var(--color);
+ font-family: var(--ion-font-family,inherit);
+ font-size: inherit;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
.footer-button {
border-radius: 3px;
padding: 0 1.1em;
@@ -12,4 +23,145 @@ ion-item {
.item-radio-checked ion-label {
color: #3ac1f1 !important;
}
-.boldTxt{font-weight:bold;}
\ No newline at end of file
+.boldTxt{font-weight:bold;}
+////////////////////////
+button.item-button.button.button-md.button-clear.button-clear-md {
+ background-color: transparent;
+}
+
+.footer-button {
+ border-radius: 3px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+}
+
+// ion-item {
+// margin-top: 5%;
+// margin-right: 7%;
+// width: 100%;
+// }
+.ionItem{
+ border: #e4e4e4 solid;
+ /* margin: 6px; */
+ /* padding: 11px; */
+ height: 85px;
+ width: 164px;
+ border-radius: 5px;
+ text-align: center;
+
+}
+
+
+.profileImageDiv{
+ text-align: center;
+ margin-bottom: -27px;
+ z-index: 3;
+ position: relative;
+ top: 0;
+
+}
+.profileImage{
+ width:60px !important;
+ // margin-left: -25px;
+ // margin-right: 22px;
+}
+
+.activated{
+ border: #209a83 0.02cm solid ;
+}
+.deactivated{ border: #e4e4e4 0.02cm solid;
+}
+.repContentDiv{
+ text-align: center;
+ width: 85%;
+ font-size: 14px;
+ border: #e4e4e4 solid;
+ border-radius: 5px;
+ padding: 20px 8px 8px 8px;
+ margin-top: -9px;
+ margin-right: -35px
+
+}
+.selIEmpDiv{
+ text-align: right;
+ margin-bottom: -26px;
+ margin-right: 0px;
+ z-index: 3;
+ position: relative;
+ top: 0;
+}
+
+.selIEmpImage{
+ width:22px !important
+
+}
+
+.noteInput{
+ border: solid var(--gray) 1px;
+ border-radius: 15px;
+ margin: 8px 17px 0px 17px;
+ padding: 10px 2px 10px 2px;
+}
+.filterInput{
+ border: solid var(--gray) 1px;
+ border-radius: 21px;
+ padding-left: 10px !important;
+}
+.filterBtn{
+ background: var(--newgreen);
+ --background: var (--newgreen);
+ border-radius: 50%;
+ height: 60px;
+ width: 60px;
+}
+
+
+
+*{
+ box-sizing: border-box;
+}
+
+.square-container{
+ // padding: 8px;
+ width:100%;
+}
+.square{
+ // width:calc(100% / 2);
+ width:50%;
+ float:left;
+ position: relative;
+ // padding-bottom: calc(100% / 2);
+}
+
+.square .content{
+ width: calc(100% - 16px) !important;
+ height: calc(100% - 16px) !important;
+ margin: 8px;
+ padding: 16px;
+ // position: absolute;
+ color: white;
+ border-radius: 9px;
+ text-align: center;
+ min-height: 90px;
+ // background-color: #0095ff;
+ // box-shadow: 0 2px 5px rgba(0, 0, 0, 0.26);
+}
+
+
+
+.empImge{
+ border-radius: 50%;
+ width:100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+}
+.empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+}
+
+
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts
index d294e22c..d136c2a1 100644
--- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts
+++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts
@@ -28,6 +28,7 @@ export class ReplacementListComponent implements OnInit {
replacmentRequest: any = "";
isAbs: boolean = false;
isSave: boolean = false;
+ active: any;
constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { }
@@ -104,27 +105,97 @@ export class ReplacementListComponent implements OnInit {
}
}
- doInfinite(infiniteScroll) {
-
- }
+
closePage() {
this.isSave = true;
let data: any = null;
if (this.isSave == true) {
if (this.selEmp) {
- data = this.ReplacementList[this.selEmp];
+ // data = this.ReplacementList[this.selEmp];
+ data=this.selEmp;
} else {
- data = null;
+ let msg: string = this.ts.trPK("replacementRoll", "msg");
+ this.cs.presentAlert(msg);
+ return;
}
- if (typeof this.callback == 'function') {
- this.callback(data);
+ // if (typeof this.callback == 'function') {
+ // this.callback(data);
+ // }
+
+
+ // this.modalController.dismiss({
+ // 'dismissed': true,
+ // empData: data
+ // });
+
+
+ this.modalController.dismiss(data);
+
+ // }else{
+
+ // let msg: string = this.ts.trPK("replacementRoll", "msg");
+ // this.cs.presentAlert(msg);
+ // return;
+
+
+ // }
+
}
+
+ }
+ closeModal() {
+ this.modalController.dismiss();
+ }
- this.modalController.dismiss({
- 'dismissed': true,
- empData: data
- });
+ select(selectEmp,index){
+ console.log(selectEmp.EMPLOYEE_DISPLAY_NAME);
+ this.selEmp=selectEmp
+ console.log("this.selEmp" + this.selEmp);
+
+ this.active=index;
+ }
+
+
+ doInfinite(infiniteScroll) {
+ if (!this.IsReachEnd) {
+
+
+ const request = new ReplacementServiceRequest();
+ request.P_PAGE_NUM = this.P_PAGE_NUM;
+ request.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
+
+ // request.P_SELECTED_EMPLOYEE_NUMBER=this.selEmp;
+
+ this.vacationRuleService.getReplacementList(request).
+ subscribe((result: any) => {
+ if (this.cs.validResponse(result)) {
+ if (this.cs.hasData(result.ReplacementList)) {
+ this.P_PAGE_NUM++;
+ result.ReplacementList.forEach(vr => {
+ if (vr.ROW_NUM == vr.NO_OF_ROWS) {
+ this.IsReachEnd = true;
+ }
+ else {
+ this.IsReachEnd = false;
+ }
+ this.ReplacementList.push(vr);
+ // this.pro.GetVacationRulesList.push(vr);
+ });
+ } else {
+ this.IsReachEnd = true;
+ }
+ }
+ //this.P_PAGE_NUM++;
+ if (infiniteScroll)
+ infiniteScroll.target.complete();
+
+
+ // console.log(resFlag);
+ }, (Error) => console.log(Error), () => infiniteScroll.target.complete());
+ } else {
+ if (infiniteScroll)
+ infiniteScroll.target.complete();
}
}
}
diff --git a/Mohem/src/app/vacation-rule/vacation-rule.module.ts b/Mohem/src/app/vacation-rule/vacation-rule.module.ts
index 7f2456cc..d376a3e0 100644
--- a/Mohem/src/app/vacation-rule/vacation-rule.module.ts
+++ b/Mohem/src/app/vacation-rule/vacation-rule.module.ts
@@ -13,6 +13,7 @@ import { CreateVacationRuleComponent } from './create-vacation-rule/create-vacat
import { ReplacementListComponent } from './replacement-list/replacement-list.component';
// import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
+import { PipesModule } from '../pipes/pipes.module';
const routes: Routes = [
{
@@ -48,6 +49,8 @@ const routes: Routes = [
CommonModule,
FormsModule,
IonicModule,
+ PipesModule,
+
HmgCommonModule,
// {
// ngModule: JsonSchemaFormModule,
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
index ef4dc2d2..b526fb7f 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
@@ -1,45 +1,44 @@
-
-
+
-
+
- {{'vacation-rule, itemType' | translate}}
-
-
- {{'vacation-rule, notification-type' | translate}}
-
-
- {{'vacation-rule, create-vacation-rule' | translate}}
-
-
+ -->
-
+
+
+
-
+
{{'vacation-rule, itemType' | translate}}
+ [(ngModel)]="index" (ionChange)="vacationRuleSel($event)" required>
{{x.ITEM_TYPE_DISPLAY_NAME}}
@@ -54,12 +53,148 @@
+
+
+
+
+
+
+
+
+
+ {{'vacation-rule, all-label' | translate}}
+
+
+
+ {{'vacation-rule, select-label' | translate}}
+
+
+
+
+
+
+
+
+
+ {{'vacation-rule, notification' | translate}}
+
+
+ {{x.NOTIFICATION_DISPLAY_NAME}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'vacation-rule, itemType' | translate}}
+ {{P_ITEM_TYPE_TITLE}}
+
+
+ {{'vacation-rule, notification' | translate}}
+ {{Notification_Title}}
+
+
+
+
+
+
+
+
+
+ {{'vacation-rule, start-date' | translate}}
+
+
+
+ {{'vacation-rule, end-date' | translate}}
+
+
+
+ {{'vacation-rule, message-label' | translate}}
+
+
+
+
+
+
+ {{assignMode.RADIO_BUTTON_LABEL}}
+
+
+
+ {{'vacation-rule, deliver' | translate}}
+
+
+
+
+ {{'vacation-rule, close' | translate}}
+
+
+
+
+ 0 && showForType_Y == false">
+ {{'vacation-rule, respond' | translate}}
+
+
+
+
+ 0 ? 'dynamicFields' : '' " id="CVDynamicFields">
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+