bug fixes

MOE_DEV
Sultan Khan 3 years ago
parent 829267e897
commit 505426e42f

@ -7,10 +7,7 @@
<ion-button class="closeIcon" (click)="closeMenu()">
<img style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png "></ion-button>
</div>
<div style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" >
</div>
<hr>
</div>
<div class="centerDiv homeBox">

@ -9,8 +9,8 @@ header
bottom: 0;
}
.mohemmLogo{
.mohemmLogo {
max-width: 46% !important;
border: 0 !important;
margin-left: 70px !important;
@ -18,8 +18,8 @@ header
margin-bottom: 11px;
}
.mohemmLogo-ar{
.mohemmLogo-ar {
max-width: 46% !important;
border: 0 !important;
margin-right: 70px !important;
@ -27,58 +27,58 @@ header
margin-bottom: 11px;
}
.closeIcon{
.closeIcon {
height: 10px !important;
margin-left: 255px !important;
margin-top: 0px !important;
background: transparent;
--background: white !important;
}
.menubutton{
.menubutton {
white-space: normal;
color: var(--light);
text-transform: capitalize;
min-height: 39px;
background: #f0ecec;
font-size: 2rem;
position: absolute;
width: 35px !important;
height: 19px;
box-shadow: 3px 0px 7px 0px #c5c2c2;
border-radius: 50%;
}
.changeIcon{
/* background: #c1c1c1; */
width: 21px;
/* height: 26px; */
border-radius: 50% !important;
position: relative;
color: #7f8c8d;
height: 35px;
}
.changeImgBtn{
color: var(--light);
text-transform: capitalize;
min-height: 39px;
background: #f0ecec;
font-size: 2rem;
position: absolute;
width: 35px !important;
height: 19px;
box-shadow: 3px 0px 7px 0px #c5c2c2;
border-radius: 50%;
}
.changeIcon {
/* background: #c1c1c1; */
width: 21px;
/* height: 26px; */
border-radius: 50% !important;
position: relative;
color: #7f8c8d;
height: 35px;
}
.changeImgBtn {
// margin: 0;
position: absolute;
top: 18%;
left: 68%;
left: 68%;
// -ms-transform: translate(-50%, -50%);
// transform: translate(-50%, -50%);
}
.logout{
background-color:#269DB8;
.logout {
background-color: #269DB8;
border: none;
color:white;
color: white;
// padding: 20px;
text-align: center;
text-decoration: none;
@ -88,38 +88,38 @@ header
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
// width: 40px;
height: 26px;
padding: 6px 24px;
}
.logout-ar{
background-color: #269DB8;
border: none;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
margin-right: 95px !important;
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
height: 26px;
padding: 6px 24px;
}
.menuImg{
width: 105px !important;
height: 105px !important;
margin-left: 90px !important;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 50% !important;
position: relative;
top: 0px;
// width: 40px;
height: 26px;
padding: 6px 24px;
}
.logout-ar {
background-color: #269DB8;
border: none;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
margin-right: 95px !important;
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
height: 26px;
padding: 6px 24px;
}
.menuImg {
width: 105px !important;
height: 105px !important;
margin-left: 90px !important;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 50% !important;
position: relative;
top: 0px;
}
.menu-header .logo {
@ -234,32 +234,34 @@ padding: 6px 24px;
position: relative;
display: block;
margin-bottom: -28px;
top: 20px;
}
.list-en{
.list-en {
margin-left: 0;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
}
.list-ar{
.list-ar {
margin-left: 0;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
}
// .sidebar-menu .header-div {
// text-transform: capitalize;
@ -293,14 +295,15 @@ button.menu-item.item.item-block.item-ios {
color: black;
font-size: 16px;
}
.TxtPlaces{
.TxtPlaces {
margin: 0;
padding: 0;
text-align: center;
font-weight: bolder;
font-size: 14px;
color: darkgray;
color: darkgray;
}
.menuFooter {
@ -325,10 +328,10 @@ button.menu-item.item.item-block.item-ios {
// }
.menuFooter .CompanyImg{
.menuFooter .CompanyImg {
width: 80%;
height: 80%;
margin-bottom: -21px;
height: 80%;
margin-bottom: -21px;
}
// .logoImg{
@ -336,39 +339,45 @@ button.menu-item.item.item-block.item-ios {
// position: relative;
// }
.logoImgWithMyTeam{
.logoImgWithMyTeam {
width: 77px;
// position: relative;
margin-top: -1px;
margin-bottom: 70px;
}
.logoImg{
.logoImg {
width: 77px;
// position: relative;
margin-top: -1px;
margin-bottom: 180px;
}
.companyTxt {
font-size: 12px;
color: var(--customnavy);
text-align: center;
}
ion-thumbnail.menu-thumb{
width:20px;
height:20px;
ion-thumbnail.menu-thumb {
width: 20px;
height: 20px;
// margin-top: 5px !important;
}
.changepassword{
color: black !important;
font-weight: bolder !important;
.changepassword {
color: black !important;
font-weight: bolder !important;
}
.profile{
.profile {
color: black !important;
font-weight: bolder !important;
}
.profileDiv-ar{
.profileDiv-ar {
margin: 5px auto !important;
}
@ -385,14 +394,14 @@ font-weight: bolder !important;
// top: 7px;
// }
.profileImg{
.profileImg {
width: 140px;
height: 140px;
display: -webkit-inline-box;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 70% !important;
position: relative;
top: 3px;
display: -webkit-inline-box;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 70% !important;
position: relative;
top: 3px;
}

@ -51,8 +51,8 @@
<ion-col [size]="accessFromOutSide ? 12 : 6" *ngIf="button.visible"> -->
<app-button (click)="checkAccess(button)" [title]="button.title | translate " [icon]="button.icon"
[settings]="button.settings" [strong]="button.txt" [class]="button.class" [disabled]="button.disabled"
*ngIf="button.visible"
[settings]="button.settings" [strong]="button.txt" [class]="button.class"
*ngIf="button.visible && !button.disabled"
[buttonClass]="button.buttonClass" [pClass]="button.pClass">
</app-button>

@ -15,7 +15,7 @@
</ion-row>
</ion-grid>
<div *ngIf="!user">
<div *ngIf="!user" [dir]="currentLang==1 ?'rtl': 'ltr'">
<ion-item class="item-input-login">
<img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/username.png" item-start />
<ion-input class="login-input" required type="text" [(ngModel)]="username" placeholder="{{ts.trPK('login','username')}}">
@ -46,7 +46,7 @@
</welcome-login>
<!-- </div> -->
<div *ngIf="!user" class="centerDiv" style="margin-top: 20px !important;">
<div *ngIf="!user" class="centerDiv" style="margin: 25px 15px !important;">
<ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
<!-- digital ID button -->

@ -1,15 +1,21 @@
.signupDiv {
font-size: 14px;
}
.customGrid {
margin-bottom: 20px;
}
.gridBtn.active{
background:var(--customnavy) !important;
color:var(--light) !important;
.gridBtn.active {
background: var(--customnavy) !important;
color: var(--light) !important;
}
.gridDiv{direction: rtl}
.gridDiv {
direction: rtl
}
.pageTitle {
color: var(--dark);
font-size: 23px;
@ -42,15 +48,14 @@ img.centerDiv {
min-width: 20px;
min-height: 20px;
display: block;
margin-top: 30px;
background: var(--light);
}
.gridDiv {
width: 100%;
height: 40px;
margin-top: 20px;
// margin-bottom: 10px;
padding: 10px 15px;
font-size: 14px;
:root[dir="ltr"] {
@ -107,28 +112,29 @@ img.centerDiv {
border-radius: 0px 2px 2px 0px !important;
}
}
}
.login-input {
border: none;
margin-right: 5px;
}
.item-input{
.item-input {
--min-height: 1.0cm !important;
--border-radius: 12px;
--ion-color-base: white !important;
// --background: color: var(--darkgray) !important;
// background: #7f8c8d !important;
border-radius: 33px;
--border: solid #9999992b !important;
border: solid #9999992b !important;
margin-bottom :12px;
margin-left: 12px;
margin-right: 12px;
border-radius: 33px;
--border: solid #9999992b !important;
border: solid #9999992b !important;
margin-bottom: 12px;
margin-left: 12px;
margin-right: 12px;
}
.button-login{
.button-login {
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
@ -142,7 +148,7 @@ img.centerDiv {
width: 315px;
}
.button-digital-id{
.button-digital-id {
--background: white !important;
background: white !important;
white-space: normal;
@ -158,10 +164,11 @@ img.centerDiv {
.content {
width: 500px;
margin-left: auto;
margin-right: auto;
width: 500px;
margin-left: auto;
margin-right: auto;
}
.first-circle {
background: var(--newgreen) !important;
border-radius: 50%;
@ -172,14 +179,16 @@ img.centerDiv {
margin-top: -140px;
}
.middle-circle {
position: relative;
background:#1a586d !important;
background: #1a586d !important;
border-radius: 50%;
height: 160px;
width: 170px;
margin: -115px 0px 0px 179px;
}
.last-circle {
position: inherit;
background: #65C399 !important;
@ -192,10 +201,10 @@ img.centerDiv {
.logoFotor {
width: 45px !important;
height: 45px !important;
}
.welcomeText{
.welcomeText {
justify-content: center;
align-items: center;
text-align: left;
@ -206,56 +215,60 @@ img.centerDiv {
margin-left: 48px;
}
.forgetText{
.forgetText {
background: transparent;
color: var(--darkblue) !important;
}
@media only screen and (max-width: 980px) {
.content{width:100%;}
.content {
width: 100%;
}
}
.circle1{
.circle1 {
width: 15%;
padding-top: 15%;
margin:0 42%;
margin: 0 42%;
background-color: black;
border-radius: 50%;
display:inline-block;
}
.circle2{
display: inline-block;
}
.circle2 {
width: 15%;
padding-top: 15%;
margin-left: 20%;
background-color:darkred;
background-color: darkred;
border-radius: 50%;
display:inline-block;
margin-top:20px;
}
.circle3{
width: 15%;
display: inline-block;
margin-top: 20px;
}
.circle3 {
width: 15%;
padding-top: 15%;
margin-left: 26%;
background-color:gold;
border-radius: 50%;
display:inline-block;
margin-top:20px;
margin-right: 15%;
}
background-color: gold;
border-radius: 50%;
display: inline-block;
margin-top: 20px;
margin-right: 15%;
}
.digital-id-en{
.digital-id-en {
color: black;
position: absolute;
right: 20px;
width: 10%;
}
}
.digital-id-ar{
.digital-id-ar {
color: black;
position: absolute;
left: 20px;
width: 10%;
}
}

@ -142,12 +142,13 @@ export class LoginComponent implements OnInit, OnDestroy {
public changeLanguage(langNumber) {
console.log("current lang: " + this.currentLang)
console.log("click lang: " + langNumber)
if (this.currentLang == langNumber) {
this.currentLang = langNumber;
return;
} else {
this.ts.switchLanguage();
// tslint:disable-next-line: triple-equals
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
this.language = 'US';
} else {
@ -156,6 +157,7 @@ export class LoginComponent implements OnInit, OnDestroy {
this.currentLang = TranslatorService.getCurrentLanguageCode();
}
this.currentLang = langNumber;
}
public forgetPasswordPage() {
@ -390,19 +392,19 @@ export class LoginComponent implements OnInit, OnDestroy {
return await modal.present();
}
showPassword(){
showPassword() {
this.inputType = 'password';
}
hidePassword(){
hidePassword() {
this.inputType = 'text';
}
async appUpdate(msg, result) {
const modal = await this.modalController.create({
component: AppUpdateComponent,
cssClass: 'app-update-modal-css',
componentProps: {'msg':msg}
component: AppUpdateComponent,
cssClass: 'app-update-modal-css',
componentProps: { 'msg': msg }
});
modal.onDidDismiss().then((data) => {
this.handleAppUpdate(result);

@ -1,25 +1,26 @@
.header-toolbar{
.header-toolbar {
--background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%);
}
.btnBack{
.btnBack {
background: transparent;
}
ion-img{
ion-img {
width: 180px;
height: 180px;
background:transparent;
background: transparent;
}
h1{
h1 {
font-size: 28px !important;
}
span{
span {
font-weight: bold;
}
.button-login{
.button-login {
--background: var(--newgreen) !important;
background: var(--newgreen) !important;
@ -35,11 +36,11 @@ span{
.leftDiv {
margin: auto;
text-align: left;
display: block;
}
.sms_code{
.sms_code {
margin: 0px;
text-align: center;
}
@ -57,12 +58,13 @@ ion-input {
transition: all .2s ease-in-out;
border-radius: 3px;
display: inline-block;
&:focus {
border-color:var(--ion-color-secondary) !important;
box-shadow: 0 0 5px var(--ion-color-secondary) !important inset;
border-color: var(--ion-color-secondary) !important;
box-shadow: 0 0 5px var(--ion-color-secondary) !important;
}
&::selection {
background: transparent;
background: transparent;
}
}
}

@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { ElementRef } from '@angular/core';
import { NavController, Platform } from '@ionic/angular';
import { IonContent, NavController, Platform } from '@ionic/angular';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
@ -28,6 +28,7 @@ import { NFC } from "@ionic-native/nfc/ngx";
import { SmsRetriever } from '@ionic-native/sms-retriever/ngx';
@Component({
selector: 'app-sms-page',
@ -41,7 +42,7 @@ import { SmsRetriever } from '@ionic-native/sms-retriever/ngx';
export class SmsPageComponent implements OnInit {
@ViewChild(IonContent) content: IonContent;
public static LOGIN_DATA = 'LOGIN_DATA';
Channel = 0;
@ -189,6 +190,7 @@ export class SmsPageComponent implements OnInit {
.then((res: any) => this.checkActivation(res, true))
.catch((error: any) => console.error(error));
this.content.scrollToTop(0);
}
@ -620,7 +622,7 @@ export class SmsPageComponent implements OnInit {
const sibPre = t.previousElementSibling;
if (key === undefined && e.target.value.length==4 && (this.platform.is('ios') && !this.platform.is('mobileweb'))) {
if (key === undefined && e.target.value.length == 4 && (this.platform.is('ios') && !this.platform.is('mobileweb'))) {
this.checkActivation(e.target.value, false);
}

@ -27,9 +27,9 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
//public static host = 'https://uat.hmgwebservices.com/';
public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
public static host = 'http://riyt-mohemm1:1010/' //MOE
// public static host = 'http://riyt-mohemm1:1010/' //MOE
constructor(public httpClient: HttpClient,
public cs: CommonService,
private events: Events,

@ -13,6 +13,7 @@
display: block;
width: 100%;
position: static;
img {
// display: block;
// max-width: 45%;
@ -28,6 +29,7 @@
.titleBox {
display: block;
span {
font-size: 25px;
font-weight: bold;
@ -37,6 +39,10 @@
}
}
ion-app[dir="rtl"] .titleBox {
text-align: right;
}
.pClass {
color: black;
width: 85%;
@ -47,7 +53,7 @@
font-size: 14px !important;
}
.iconFab{
.iconFab {
margin-left: -20px;
margin-top: 10px;
width: 100px;
@ -59,7 +65,8 @@
width: 100%;
top: 70px;
left: 2px;
img {
width: 25px;
}
}
}

@ -27,7 +27,7 @@
<ion-row *ngFor="let menuItem of menuEntries; let i=index">
<ion-col [size]="12">
<ion-label>{{menuItem.PROMPT}}</ion-label>
<ion-label class="menu-label">{{menuItem.PROMPT}}</ion-label>
</ion-col>
<ion-slides [options]="slideOptsTwo">

@ -3,10 +3,11 @@ ion-row {
margin-top: 10px;
}
.header-toolbar-new{
.header-toolbar-new {
--background: #269DB8;
}
.profile-image-container{
.profile-image-container {
position: relative;
z-index: 999;
// img {
@ -18,7 +19,8 @@ ion-row {
// // margin-right: 4px;
// }
}
.profile-image{
.profile-image {
width: 32px;
float: right;
// margin-top: -42px;
@ -26,45 +28,51 @@ ion-row {
height: 32px;
// margin-right: 4px;
}
ion-title{
ion-title {
color: white;
position: absolute;
top: 0;
text-align: center;
left:20%;
left: 20%;
right: 20%;
font-size: 0.42cm;
font-weight: bold;
height: 100%;
}
ion-label{
ion-label {
display: block;
color: black !important;
font-size: 14px;
font-weight: bold;
}
.main-dashboard-container{
.main-dashboard-container {
position: relative;
width: 100%;
}
.contentBg:before {
position: absolute;
content: "";
background: #269DB8;
height: 100px;
width: 100%;
left: 0;
top: 0px;
z-index: 1;
content: "";
background: #269DB8;
height: 100px;
width: 100%;
left: 0;
top: 0px;
z-index: 1;
}
.main-container{
.main-container {
position: relative;
z-index: 2;
padding-right: 15px;
padding-left: 15px;
padding-bottom: 130px;
}
.attendance-module{
.attendance-module {
border-radius: 20px;
background-color: #292F42;
padding: 10px;
@ -72,21 +80,25 @@ ion-label{
width: 100%;
margin-top: 25px;
margin-bottom: 0px;
h3{
h3 {
font-size: 18px;
font-weight: bold;
margin: 0;
}
span{
span {
font-size: 13px;
display: block;
}
img{
img {
display: block;
margin: 10px auto;
width: 80%;
}
ion-button{
ion-button {
border-radius: 10px;
padding: 10px;
background: #269db8;
@ -98,10 +110,12 @@ ion-label{
font-size: 12px;
}
}
.swiper-container {
margin: 0 !important;
width: 100% !important;
}
.fixed-shift-time-en {
right: 20px;
}
@ -110,10 +124,11 @@ ion-label{
left: 20px;
}
.fixed-shift-timer{
.fixed-shift-timer {
position: fixed;
bottom: 20px;
z-index: 2;
span.subTitle {
position: absolute;
left: 50%;
@ -163,6 +178,7 @@ ion-label{
width: 100%;
top: 70px;
left: 2px;
img {
width: 25px;
}

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save