add history&RequestPage

accural-balance
Mohamed Mekawy 6 years ago
parent f316629cb0
commit 2b5265243e

@ -1,15 +1,12 @@
<ion-header>
<ion-toolbar class="header-toolbar">
<ion-buttons slot="start">
<!-- <ion-back-button color="light" class="btnBack" defaultHref="/eit/homepage" ></ion-back-button> -->
<nav-buttons backLink=""></nav-buttons>
</ion-buttons>
<ion-title color="light">{{headerTitle}}</ion-title>
</ion-toolbar>
<ion-toolbar class="header-toolbar-new">
<nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
<ion-title>{{headerTitle}}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
<div *ngIf="eitAddedList && eitAddedList.length > 0 ">
<ion-card *ngFor="let eitAddedObj of eitAddedList; let i=index ">
@ -63,9 +60,9 @@
<!-- <no-data *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0" txt="{{'general.noData' | translate}}"></no-data> -->
<div *ngIf="getResEITTransactionList && getResEITTransactionList[0]?.Collection_Transaction.length > 0 ">
<!-- <div> -->
<ion-card *ngFor="let EITTransactionList of getResEITTransactionList; let i=index ">
<div *ngFor="let EITTransactionList of getResEITTransactionList; let i=index ">
<ion-card-header class="boxHdr">
<!-- <ion-card-header class="boxHdr">
<div class="hrTitle">{{this.headerTitle}}</div>
<button ion-button (click)="deleteEIT(i)"
@ -74,37 +71,52 @@
<button ion-button *ngIf="getPassMnuEntryObj.UPDATE_BUTTON == 'Y' && EITTransactionList.statusID!=2"
(click)="updateEITRrq(i)">
<img class="imgSize" src="../assets/imgs/edit.png"></button>
</ion-card-header>
<ion-card-content>
</ion-card-header> -->
<!-- <ion-card-content> -->
<ion-grid>
<div>
<ion-row>
<!-- <ion-row>
<ion-col class="colBold">
<label for="">status</label>
</ion-col>
<ion-col>
<label for="">{{EITTransactionList.status}}</label>
</ion-col>
</ion-row>
</ion-row> -->
</div>
<ion-grid class="grids">
<div *ngFor="let item of EITTransactionList.Collection_Transaction">
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
<!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold">
<label for="">{{item.SEGMENT_PROMPT}}</label>
</ion-col>
<ion-col>
<label for="">{{item.SEGMENT_VALUE_DSP}}</label>
</ion-col>
</ion-row>
</ion-row> -->
<ion-row class="">
<ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
<br>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br>
<hr style="background-color: grey;height: 1px">
</ion-col>
</ion-row>
</div>
</ion-grid>
</ion-card-content>
</ion-card>
</ion-grid>
<!-- </ion-card-content> -->
</div>
<div>
</div>
</div>
<ion-icon class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
@ -115,7 +127,7 @@
<div class="centerDiv">
<!-- <button *ngIf="getPassMnuEntryObj.ADD_BUTTON == 'Y'" ion-button (click)="addEITRrq()">{{'requestEit.add'
| translate}} </button> -->
<ion-button class="footer-button" color="customnavy" ion-button (click)="addEITRrq()">
{{'general, add' | translate}}</ion-button>
<!-- <ion-button class="footer-button" color="customnavy" ion-button (click)="addEITRrq()">
{{'general, add' | translate}}</ion-button> -->
</div>
</ion-footer>

@ -9,3 +9,77 @@ h4 {
text-align: center;
color: #000000;
}
.grids{
border-radius: 20px !important;
background: white;
padding-left: 1px;
padding-right: 1px;
margin: 13px;
padding-top: 0px;
padding-bottom: 3px;
padding-left: 13px;
padding-right: 13px;
border: 1px solid #cac8c8;
}
.bgcolor {
color: white;
border-top-right-radius: 19px;
border-top-left-radius: 15px;
padding-top: 1;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;
/* border-radius: 12px !important; */
background: #094875;
border-bottom: 1px solid #a7a4a4;
border-top: 1px solid #cac8c8;
margin-left: -13px;
margin-right: -13px;
}
.colEit{
border-right: 1px solid #cac8c8;
border-bottom-left-radius: -10px !important;
padding-top: 8px;
padding-bottom: 8px;
margin-left: 18px;
font-size: 12px !important;
}
.header-div {
background-color: #22C6B3;
text-transform: capitalize;
height: 160px;
position: relative;
display: block;
margin-bottom: -28px;
}
.header-toolbar-new{
--background: #22c6b3;
}
.addClass{
background-color: #094875;
width: 80px;
height: 80px;
right: 8%;
position: fixed;
color: white;
bottom: 20%;
border-radius: 50%;
z-index: 999;
-webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
-moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
}
.hrClass{
border-width: 0;
box-sizing: content-box;
border-bottom: 1px solid #e6e6e6;
background: #fff !important;
height: 1px;
}

@ -5,7 +5,7 @@
</ion-buttons>
<p class="proTitles">{{ts.trPK('userProfile','performance')}}</p>
<div class="profilediv" (click)="openPersonalInfo()">
<div class="profilediv">
<img class="profileImg" [src]="user_image">
</div>
<!-- <ion-img class="profileImg" [src]="imageSrc"></ion-img> -->

@ -42,8 +42,8 @@ export class DateTimeInput extends UiElement {
// timeValue=arrayDate[1];
// }
const template =
"<ion-item>" +
" <ion-label style='font-size: medium !important;' class='daynamicForm-Label " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
"<ion-item class='dynamicField'>" +
" <ion-label position='floating' style='font-size: medium !important;' class='daynamicForm-Label " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
// " <div class='daynamicForm-DateTime " + disaledClass + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + ">" + this.value + "</div>" +
"<ion-datetime min='1900' max='2100' displayFormat='DD/MM/YYYY' value='" + this.value + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + "></ion-datetime>" +
// " <input class='daynamicForm-DateTime' type='text' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" (click)='showDateTimePicker()'/>"+

@ -41,8 +41,8 @@ export class DateInput extends UiElement {
// " <input class='daynamicForm-DateTime' type='date' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" />"+
// "</div> ";
"<ion-item>" +
" <ion-label style='font-size: medium !important;' class='daynamicForm-Label " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
"<ion-item class='dynamicField'>" +
" <ion-label position='floating' style='font-size: medium !important;' class='dynamiclable-float " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
// " <div class='daynamicForm-DateTime " + disaledClass + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + ">" + this.value + "</div>" +
"<ion-datetime min='1900' max='2100' class='onic-date' (ionChange)='setDate()' displayFormat='MMM/DD/YYYY' value='" + this.value + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
// " <input class='daynamicForm-DateTime' type='text' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" (click)='showDateTimePicker()'/>"+

@ -26,8 +26,8 @@ export class NumberInput extends UiElement {
// " <input class='daynamicForm-Input' type='number' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + " />" +
// "</div> ";
"<ion-item style='" + this.hidden + "'>" +
"<ion-label style='font-size: medium !important;' class='" + requiredClass + "'>" + this.label + "</ion-label>" +
"<ion-item style='" + this.hidden + "' class='dynamicField'> " +
"<ion-label position='floating' style='font-size: medium !important;' class='" + requiredClass + " dynamiclable-float'>" + this.label + "</ion-label>" +
"<ion-input type='number' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
"</ion-item> ";

@ -26,8 +26,8 @@ export class TextAreaInput extends UiElement {
// "<textarea class='daynamicForm-Input' id='" + this.elementId + "' " + this.disabled + " >" + this.value + "</textarea>" +
// "</div> ";
"<ion-item style='" + this.hidden + "' >" +
"<ion-label style='font-size: medium !important;' id='title' >" + this.label + "</ion-label>" +
"<ion-item style='" + this.hidden + "' class='dynamicField'>" +
"<ion-label class='dynamiclable-float' position='floating' style='font-size: medium !important;' id='title' >" + this.label + "</ion-label>" +
"<ion-textarea id='" + this.elementId + "' " + this.disabled + " >" + this.value + "</ion-textarea>" +
"</ion-item>";

@ -24,9 +24,9 @@ export class TextInput extends UiElement {
if (this.hidden === "N") { this.hidden = "display:none;" } else { this.hidden = "" }
const template =
// "<div class='custom-text-area-element' style='" + this.hidden + "'>" +
"<ion-item style='" + this.hidden + "'>" +
" <ion-label style='font-size: medium;' class='" + requiredClass + "'>" + this.label + "</ion-label>" +
" <ion-input type='text' data-colm-text='" + this.textVal + "' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
"<ion-item style='" + this.hidden + "' class='dynamicField'>" +
" <ion-label position='floating' style='font-size: medium;' class='" + requiredClass + " dynamiclable-float'>" + this.label + "</ion-label>" +
" <ion-input style='' type='text' data-colm-text='" + this.textVal + "' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
"</ion-item> ";
return template;

@ -32,7 +32,7 @@ export class TimeInput extends UiElement {
}
const template =
"<div class='custom-text-area-element' style='"+this.hidden+"'>" +
" <label class='daynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
" <label class='daynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
// " <input class='daynamicForm-DateTime' type='time' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" />"+
" <div class='daynamicForm-DateTime "+disaledClass+"' id='" + this.elementId + "' data-dtvalue='" + this.value + "' "+this.disabled+">"+this.value+"</div>"+
"</div> ";

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 B

@ -95,6 +95,8 @@ ion-label{
.btnBack{
background: transparent !important;
}
/***************/
.attachImg{
max-width: 30px;
@ -393,7 +395,160 @@ ion-col.colBold,ion-col.colBold>label{
// padding:0px;
// }
.floating-form {
width:320px;
}
// /**** floating-Lable style start ****/
// .floating-label {
// position:relative;
// margin-bottom:20px;
// }
// .floating-input , .floating-select {
// font-size:14px;
// padding:4px 4px;
// display:block;
// width:100%;
// height:30px;
// background-color: transparent;
// border:none;
// border-bottom:1px solid #757575;
// }
// .floating-input:focus , .floating-select:focus {
// outline:none;
// border-bottom:2px solid #5264AE;
// }
// label {
// color:#999;
// font-size:14px;
// font-weight:normal;
// position:absolute;
// pointer-events:none;
// left:5px;
// top:5px;
// transition:0.2s ease all;
// -moz-transition:0.2s ease all;
// -webkit-transition:0.2s ease all;
// }
// .floating-input:focus ~ label, .floating-input:not(:placeholder-shown) ~ label {
// top:-18px;
// font-size:14px;
// color:#5264AE;
// }
// .floating-select:focus ~ label , .floating-select:not([value=""]):valid ~ label {
// top:-18px;
// font-size:14px;
// color:#5264AE;
// }
// /* active state */
// .floating-input:focus ~ .bar:before, .floating-input:focus ~ .bar:after, .floating-select:focus ~ .bar:before, .floating-select:focus ~ .bar:after {
// width:50%;
// }
// *, *:before, *:after {
// -webkit-box-sizing: border-box;
// -moz-box-sizing: border-box;
// box-sizing: border-box;
// }
// .floating-textarea {
// min-height: 30px;
// max-height: 260px;
// overflow:hidden;
// overflow-x: hidden;
// }
// /* highlighter */
// .highlight {
// position:absolute;
// height:50%;
// width:100%;
// top:15%;
// left:0;
// pointer-events:none;
// opacity:0.5;
// }
// /* active state */
// .floating-input:focus ~ .highlight , .floating-select:focus ~ .highlight {
// -webkit-animation:inputHighlighter 0.3s ease;
// -moz-animation:inputHighlighter 0.3s ease;
// animation:inputHighlighter 0.3s ease;
// }
// /* animation */
// @-webkit-keyframes inputHighlighter {
// from { background:#5264AE; }
// to { width:0; background:transparent; }
// }
// @-moz-keyframes inputHighlighter {
// from { background:#5264AE; }
// to { width:0; background:transparent; }
// }
// @keyframes inputHighlighter {
// from { background:#5264AE; }
// to { width:0; background:transparent; }
// }
// /**** floating-Lable style end ****/
/*** Body style start ***/
// html {
// font-family: "Helvetica Neue", Helvetica, "Noto Sans", sans-serif, Arial, sans-serif;
// font-size: 12px;
// line-height: 1.42857143;
// color: #949494;
// background-color: #ffffff;
// }
/*** Body style end ***/
/*** daniel - Fork me friend - style ***/
// .floating-credit { position:fixed; bottom:10px;right:10px; color:#aaa; font-size:13px;font-family:arial,sans-serif; }
// .floating-credit a { text-decoration:none; color:#000000; font-weight:bold; }
// .floating-credit a:hover { border-bottom:1px dotted #f8f8f8; }
// .floating-heading { position:fixed; color:#aaa; font-size:20px; font-family:arial,sans-serif; }
/*** daniel - Fork me friend - style ***/
/**************************TEST********************888/
/*****************dynamic form*******************/
.dynamicField{
border-radius: 30px;
border: 1px solid grey!important;
margin-bottom: 20px;
}
.daynamicForm-Label{
font-size: 16px;
// margin-left: 15px;

@ -340,7 +340,7 @@ ion-item{
--flex:none;
}
ion-input ,ion-datetime{
border-bottom: #dedede 1px solid;
// border-bottom: #dedede 1px solid;
}
.left {
.timeline:before{

Loading…
Cancel
Save