Merge branch 'sultan26April' into umar-q2-branch
# Conflicts: # Mohem/src/app/profile/home/home.component.html # Mohem/src/app/profile/home/home.component.ts # Mohem/src/app/profile/profile.module.ts # Mohem/src/app/profile/service/profile.service.tsMOHEMM-SFH-COLORS
commit
86f8a25bee
@ -0,0 +1,14 @@
|
||||
|
||||
import { EitTransactionModel } from './eit.transaction.model';
|
||||
|
||||
export class EitAddressRequest {
|
||||
public static SHARED_DATA = 'eit-request';
|
||||
public P_MENU_TYPE: string;
|
||||
public P_SELECTED_EMPLOYEE_NUMBER: string;
|
||||
public P_FUNCTION_NAME: string;
|
||||
public P_SELECTED_RESP_ID: Number;
|
||||
P_DESC_FLEX_CONTEXT_CODE: string;
|
||||
EITTransactionTBL: EitTransactionModel[];
|
||||
P_COUNTRY_CODE: string
|
||||
P_EFFECTIVE_DATE: string
|
||||
}
|
||||
@ -1,3 +1,34 @@
|
||||
<p>
|
||||
add-address works!
|
||||
</p>
|
||||
<app-generic-header
|
||||
showBack="!getPassdirfromNotifiPage"
|
||||
[updateDirection]="getPassdirfromNotifiPage"
|
||||
[headerText]="headerTitle"
|
||||
(trigger)="closeModal()"
|
||||
>
|
||||
</app-generic-header>
|
||||
|
||||
|
||||
|
||||
<ion-content padding>
|
||||
<ion-item class="country dynamicField" lines="none">
|
||||
<ion-label> {{ts.trPK('general','country')}}</ion-label>
|
||||
<ion-select value="brown" okText="Okay" cancelText="Dismiss" [(ngModel)]="country">
|
||||
<ion-select-option [value]="country.COUNTRY_CODE" *ngFor="let country of countries">{{country.COUNTRY_NAME}}</ion-select-option>
|
||||
|
||||
</ion-select>
|
||||
</ion-item>
|
||||
|
||||
<ion-item class="country dynamicField" lines="none">
|
||||
<ion-label> Effective Date</ion-label>
|
||||
<ion-datetime [(ngModel)]="effectiveDate" min="1900" max="2100" displayFormat="DD/MM/YYYY " placeholder="MM/DD/YYYY"
|
||||
></ion-datetime>
|
||||
</ion-item>
|
||||
<div #containerDiv id="containerDiv">
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
<ion-footer>
|
||||
<div class="centerDiv">
|
||||
<ion-button class="addEitOkButton" color="customnavy" ion-button (click)="validateEITTransaction()">
|
||||
{{'vacation-rule, next-label' | translate}}</ion-button>
|
||||
</div>
|
||||
</ion-footer>
|
||||
@ -0,0 +1,44 @@
|
||||
.footer-button {
|
||||
border-radius: 2px;
|
||||
padding: 0 1.1em;
|
||||
min-height: 45px;
|
||||
min-width: 200px;
|
||||
}
|
||||
|
||||
ion-label {
|
||||
color: var(--customnavy) !important;
|
||||
}
|
||||
|
||||
.daynamicForm-Label {
|
||||
font-size: 16px;
|
||||
color: #a2a5a6 !important;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
-webkit-flex: 1;
|
||||
flex: 1;
|
||||
font-size: inherit;
|
||||
white-space: normal;
|
||||
padding: 5px 0px;
|
||||
margin: 10px auto;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
.header-toolbar-new{
|
||||
--background: #269DB8;
|
||||
}
|
||||
.addEitOkButton{
|
||||
white-space: normal !important;
|
||||
text-transform: capitalize !important;
|
||||
min-height: 45px !important;
|
||||
min-width: 5px !important;
|
||||
margin: 8px !important;
|
||||
background-color: #269DB8;
|
||||
width: 80% !important;
|
||||
color: white!important;
|
||||
border-radius: 16px !important;
|
||||
}
|
||||
.country{
|
||||
margin-top: 10px;
|
||||
padding: 10px;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue