diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 037c2146..48249f3a 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -1,285 +1,300 @@ -.imgSize{ - position: absolute; - right: 15px; - top: 0; - bottom: 0; - margin: auto; - height:20px; - width:20px; +.imgSize { + position: absolute; + right: 15px; + top: 0; + bottom: 0; + margin: auto; + height: 20px; + width: 20px; } + .rowAH ion-col { - border: 1px solid #d9d9d9; - font-size: 13px; + border: 1px solid #d9d9d9; + font-size: 13px; } + .titleH { - font-size: 13px; - border: 1px solid #d9d9d9; - border-top-right-radius: 5px; - border-top-left-radius: 5px; - border-bottom: 0px; + font-size: 13px; + border: 1px solid #d9d9d9; + border-top-right-radius: 5px; + border-top-left-radius: 5px; + border-bottom: 0px; } + .gridAH { - text-align: center; - padding: 5px 5px !important; - border-radius: 5px; + text-align: center; + padding: 5px 5px !important; + border-radius: 5px; } -ion-card-content.confirm-details{ - padding: 0; + +ion-card-content.confirm-details { + padding: 0; } -.confirm-details label{ - font-size: 13px; + +.confirm-details label { + font-size: 13px; } /****************** NEW Design ***************************************/ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + + + +.Header { + font-weight: bold; + color: #c6903e !important; + font-size: 10px; +} + +.tbData { + font-size: 10px; +} + +.btnBack { + background: transparent; + float: right; +} + +.attachmentDiv { + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +.submitNote { + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.approvalList { + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +/************************New Design**********************************/ +.notification-list { + background: none; + background: none; + border-radius: 32px; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; + } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } - - .Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; - } - - .tbData { - font-size: 10px; - } - - .btnBack { - background: transparent; - float: right; - } - - .attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - .submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - - /************************New Design**********************************/ - .notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - } - } - - - - - - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - - - - .timeline .timeline-item { - // width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - .empImge{ - border-radius: 50%; - width:60px; - height: 60px; - border: #dedede solid 1px; - - } - .empImgeRep { - border-radius: 50% !important; - width: 80px; - height: 80px; - border: #dedede solid 1px; - } - - .line{ - padding-bottom:87px; - } - - .attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #44A7A1; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; - } - - .removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; - } - - .note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - - } - .header-toolbar-new{ - --background: #024d71; - } - - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - --background: #0ca2de; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - } - .approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } \ No newline at end of file +} + + + + + + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + // width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + +.empImge { + border-radius: 50%; + width: 60px; + height: 60px; + border: #dedede solid 1px; + +} + +.empImgeRep { + border-radius: 50% !important; + width: 80px; + height: 80px; + border: #dedede solid 1px; +} + +.line { + padding-bottom: 87px; +} + +.attachLable { + position: absolute; + top: 0px; + z-index: 0; + background: #30b8c6; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; +} + +.removeLable { + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius: 20px; + +} + +.header-toolbar-new { + --background: #BE332F; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + --background: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} + +.approvalTitle-ar { + font-weight: bold; + font-size: 16px; + text-align: right; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} \ No newline at end of file diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html index 71480043..d86a6c96 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html @@ -123,10 +123,10 @@
- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 231772fb..9c24e7d2 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -145,7 +145,7 @@
- +

@@ -154,7 +154,7 @@
- +

@@ -163,7 +163,7 @@
- +

@@ -172,7 +172,7 @@
- +

@@ -181,7 +181,7 @@
- +

@@ -190,7 +190,7 @@
- +

@@ -199,7 +199,7 @@
- +

@@ -208,7 +208,7 @@
- +

diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 77feaaba..062f0f4d 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -1,125 +1,128 @@ -.imgSize{ - position: absolute; - right: 15px; - top: 0; - bottom: 0; - margin: auto; - height:20px; - width:20px; -} - -.addClass{ - background-color: #024d71; - width: 80px; - height: 80px; - right: 8%; - position: fixed; - color: white; - bottom: 5%; - 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); - } +.imgSize { + position: absolute; + right: 15px; + top: 0; + bottom: 0; + margin: auto; + height: 20px; + width: 20px; +} - .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; - margin-bottom: 10% !important; - } - - .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: #024d71; - border-bottom: 1px solid #a7a4a4; - border-top: 1px solid #cac8c8; - margin-left: -13px; - margin-right: -13px; - } - - - .header-div { - background-color: #024d71; - text-transform: capitalize; - height: 100px; - } - - .header-toolbar-new{ - --background: #024d71; - } - - - .hrClass{ - border-width: 0; - box-sizing: content-box; - border-bottom: 1px solid #e6e6e6; - background: #fff !important; - height: 1px; - } +.addClass { + background-color: #BE332F; + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 5%; + 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); +} - //////////////////////////////////////////////down +.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; + margin-bottom: 10% !important; +} - .colorBG{ - --background: #f0efef; - } +.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: #BE332F; + border-bottom: 1px solid #a7a4a4; + border-top: 1px solid #cac8c8; + margin-left: -13px; + margin-right: -13px; +} +.header-div { + background-color: #BE332F; + text-transform: capitalize; + height: 100px; +} +.header-toolbar-new { + --background: #BE332F; +} - .Title{ - text-align: center; - color: white; - margin-top: -33px; - font-size: 17px; - } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - margin-bottom: -30px; - } +.hrClass { + border-width: 0; + box-sizing: content-box; + border-bottom: 1px solid #e6e6e6; + background: #fff !important; + height: 1px; +} - .datetime{ - text-align: center; - font-family: WorkSans-Bold; - margin-left: -120px; - margin-top: -19px; +//////////////////////////////////////////////down + +.colorBG { + --background: #f0efef; +} + + + + +.Title { + text-align: center; + color: white; + margin-top: -33px; + font-size: 17px; +} + +.result-graph { + font-size: 14px; + margin-left: -48px; + margin-right: 3px; + margin-bottom: -30px; +} + +.datetime { + text-align: center; + font-family: WorkSans-Bold; + margin-left: -120px; + margin-top: -19px; + +} + +.datelabel { + margin-left: 150px; + color: black !important; + font-family: WorkSans-Bold; +} + +.iconCalendar { + // margin-left: -241px; + // margin-top: 5px; + margin-left: -12px !important; + width: 22% !important; + height: 26px !important; + margin-top: -50px !important; + margin-bottom: 23px !important; +} - } - .datelabel{ - margin-left: 150px; - color: black !important; - font-family: WorkSans-Bold; - } - .iconCalendar{ - // margin-left: -241px; - // margin-top: 5px; - margin-left: -12px !important; - width: 22% !important; - height: 26px !important; - margin-top: -50px !important; - margin-bottom: 23px !important; - } // .today-graph{ - + // display: block !important; // height: 196px; // width: 385px; @@ -137,100 +140,104 @@ // margin-bottom: -30px; // } - .headerGrid{ - background-color: white !important; - border: 1px solid #cac8c8 !important; - border-radius: 20px !important; - padding-top: 28px; - padding-bottom: 26px; - margin-left: 13px; - margin-right: 13px; - margin-top: -93px; - margin-bottom: 10px; - - } - .header{ - - margin-top: -126px; - } - .result-text-container { - padding: 0; - margin: 0; - position: absolute; - left: 31%; - top: 23%; - display: block; - text-align: center; - transform: translate(-50%, -50%); +.headerGrid { + background-color: white !important; + border: 1px solid #cac8c8 !important; + border-radius: 20px !important; + padding-top: 28px; + padding-bottom: 26px; + margin-left: 13px; + margin-right: 13px; + margin-top: -93px; + margin-bottom: 10px; + +} + +.header { + + margin-top: -126px; +} + +.result-text-container { + padding: 0; + margin: 0; + position: absolute; + left: 31%; + top: 23%; + display: block; + text-align: center; + transform: translate(-50%, -50%); - h2 { + h2 { - font-size: 25px; - font-family: WorkSans-Bold; - margin: 0 auto; - // margin-top: 289px; - line-height: 36px; + font-size: 25px; + font-family: WorkSans-Bold; + margin: 0 auto; + // margin-top: 289px; + line-height: 36px; - } + } - span { + span { - width: 125px; - display: block; - margin: 0 auto; - font-size: 12px; - // margin-top: 289px; - font-family: workSans-Regular; - } + width: 125px; + display: block; + margin: 0 auto; + font-size: 12px; + // margin-top: 289px; + font-family: workSans-Regular; } -.green-label{ -font-size: 12px; -margin-top: -13px; } -.green-amount{ +.green-label { + font-size: 12px; + margin-top: -13px; +} + +.green-amount { font-size: 15px; font-family: WorkSans-Bold; margin-top: 0px; } -.red-label{ +.red-label { font-size: 12px; margin-top: -13px; - } - - .red-amount{ - font-size: 15px; - font-family: WorkSans-Bold; - margin-top: 0px; - } +} + +.red-amount { + font-size: 15px; + font-family: WorkSans-Bold; + margin-top: 0px; +} - - .orng-label{ - font-size: 12px; - margin-top: -13px; - } - - - .orng-amount{ - font-size: 15px; - font-family: WorkSans-Bold; - margin-top: 0px; - } - - .contentEit:before { - position: absolute; + +.orng-label { + font-size: 12px; + margin-top: -13px; +} + + +.orng-amount { + font-size: 15px; + font-family: WorkSans-Bold; + margin-top: 0px; +} + +.contentEit:before { + position: absolute; content: ""; - // background: #024d71; + // background: #BE332F; height: 140px; width: 100%; left: 0; top: 0px; z-index: 1; - } - .div-green{ +} + +.div-green { position: relative; left: 82%; bottom: 141px; @@ -238,9 +245,9 @@ margin-top: -13px; background-color: #1FA269; width: 11%; height: 6px; - } +} - .div-red-ar{ +.div-red-ar { position: relative; bottom: 59px; color: black; @@ -250,7 +257,8 @@ margin-top: -13px; height: 6px; right: 16px; - } +} + // .div-red-ar{ // position: relative; // bottom: 131px; @@ -266,12 +274,12 @@ margin-top: -13px; // bottom: 146px; // color: black; // background-color: #CB3232; -// // background-color: #024d71; +// // background-color: #BE332F; // width: 11%; // height: 6px; // } - - .div-red{ + +.div-red { position: relative; left: 82%; bottom: 80px; @@ -280,8 +288,9 @@ margin-top: -13px; // background-color: #DDB017; width: 11%; height: 6px; - } - .div-green-ar{ +} + +.div-green-ar { position: relative; bottom: 124px; color: black; @@ -290,15 +299,16 @@ margin-top: -13px; width: 11%; height: 6px; right: 16px; - } -.subTitle{ +} + +.subTitle { margin-top: -10px; margin-left: 10px; font-family: WorkSans-Bold; font-size: 16px; } -.subTitle-ar{ +.subTitle-ar { margin-top: -10px; margin-right: 10px; font-family: WorkSans-Bold; @@ -311,8 +321,8 @@ margin-top: -13px; height: 102px; width: 211px; margin-top: 20px; -margin-left: -39px; -max-height: 4cm; + margin-left: -39px; + max-height: 4cm; } .today-graph-ar { @@ -325,11 +335,12 @@ max-height: 4cm; margin-right: 105px; } -.graph-container{ +.graph-container { margin-left: 160px; position: relative; margin-top: -98px; } + // .label-container{ // position: absolute; // // width: 20%; @@ -337,26 +348,31 @@ max-height: 4cm; // top: 50%; // margin-top: -27px; // left: 20px; - + // } -.green-label-container{ - margin-top: 20px; margin-left: 12px; - +.green-label-container { + margin-top: 20px; + margin-left: 12px; + } -.green-label-container-ar{ - margin-top: 20px; margin-right: 12px; - + +.green-label-container-ar { + margin-top: 20px; + margin-right: 12px; + } -.black-label-container{ +.black-label-container { margin-left: 12px; } -.black-label-container-ar{ + +.black-label-container-ar { margin-right: 12px; } -.used-label-container{ + +.used-label-container { // border-top: 5px solid #292F42; // padding: 1px 0px; // margin: 15px 0px @@ -367,7 +383,8 @@ max-height: 4cm; background-color: #b60c0c; margin-top: 30px; } -.current-label-container{ + +.current-label-container { width: 12px; height: 12px; padding-right: -10px; @@ -375,51 +392,53 @@ max-height: 4cm; background-color: black; margin-top: 21px; } -.current-label{ + +.current-label { width: 12px; height: 12px; padding-right: -10px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; // margin-top: 30px; } -.span-one{ + +.span-one { // display: block; // font-size: 12px; // color: black; display: block; font-size: 12px; - color: #024d71; + color: #BE332F; margin-left: 6px; margin-top: -2px; font-weight: bold; - + } -.span-one-ar{ +.span-one-ar { display: block; font-size: 12px; - color: #024d71; + color: #BE332F; margin-right: 6px; margin-top: -2px; font-weight: bold; - + } -.span-two{ +.span-two { // display: block; // font-size: 22px; display: block; font-size: 12px; - color: #024d71; + color: #BE332F; margin-left: 6px; margin-top: -2px; font-weight: bold; font-family: WorkSans-Bold; - + } -.black-span1{ +.black-span1 { // display: block; // font-size: 12px; // color: black; @@ -429,9 +448,10 @@ max-height: 4cm; margin-left: 6px; margin-top: 20px; font-weight: bold; - + } -.black-span1-ar{ + +.black-span1-ar { // display: block; // font-size: 12px; // color: black; @@ -441,9 +461,10 @@ max-height: 4cm; margin-right: 6px; margin-top: 20px; font-weight: bold; - + } -.black-span2{ + +.black-span2 { // display: block; // font-size: 22px; display: block; @@ -453,9 +474,10 @@ max-height: 4cm; margin-top: 20px; font-weight: bold; font-family: WorkSans-Bold; - + } -.red-span1{ + +.red-span1 { // display: block; // font-size: 12px; // color: black; @@ -465,9 +487,10 @@ max-height: 4cm; margin-left: 6px; margin-top: 28px; font-weight: bold; - + } -.red-span1-ar{ + +.red-span1-ar { // display: block; // font-size: 12px; // color: black; @@ -477,9 +500,10 @@ max-height: 4cm; margin-right: 6px; margin-top: 28px; font-weight: bold; - + } -.red-span2{ + +.red-span2 { // display: block; // font-size: 22px; display: block; @@ -489,16 +513,18 @@ max-height: 4cm; margin-top: 28px; font-weight: bold; font-family: WorkSans-Bold; - + } -.yearLabel{ + +.yearLabel { font-size: 13px; color: gray; font-family: WorkSans-Bold; margin-left: 29px; margin-top: 5px; } -.yearLabel-ar{ + +.yearLabel-ar { font-size: 13px; color: gray; font-family: WorkSans-Bold; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 66744aad..3f221aaa 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -118,7 +118,7 @@ export class HomeComponent implements OnInit { backgroundColor: [ // '#1FA269', // '#CB3232',], - '#024d71', + '#BE332F', '#b60c0c',], borderWidth: 1 } @@ -276,7 +276,7 @@ export class HomeComponent implements OnInit { { data: [this.accrualNet, this.accrualUsed], backgroundColor: [ - '#024d71', + '#BE332F', '#b60c0c',], borderWidth: 1 } diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss index 3c6c1fac..93545e99 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss @@ -1,53 +1,52 @@ -.rowBtn{ +.rowBtn { display: flex; flex-direction: row; justify-content: center; align-items: center; } -.Header{ +.Header { color: black !important; font-size: 25px !important; - font-weight: bold !important;; + font-weight: bold !important; + ; margin: 0; text-align: center; margin-bottom: 20px; } -.labelRadio{ +.labelRadio { color: black !important; font-weight: bold !important; padding-bottom: 20px; } -.labelcheck{ +.labelcheck { color: red !important; font-weight: bold !important; margin-bottom: 10px; } -.submitOkButton{ +.submitOkButton { white-space: normal !important; text-transform: capitalize !important; min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #024d71; + --background: #BE332F; width: 100% !important; - color: white!important; + color: white !important; border-radius: 16px !important; } -.submitCancelButton{ + +.submitCancelButton { white-space: normal !important; text-transform: capitalize !important; min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #024d71; + --background: #BE332F; width: 100% !important; - color: white!important; + color: white !important; border-radius: 16px !important; -} - - - +} \ No newline at end of file diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 577d25ec..a17d5982 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -1,115 +1,116 @@ -.search-button{ - background: transparent; - font-size: 25px; - color: #7F8C8D; +.search-button { + background: transparent; + font-size: 25px; + color: #7F8C8D; } -.header-toolbar-new{ - --background: #024d71; - } - - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - --background: #44A7A1; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - --border-radius: 16px !important; - } +.header-toolbar-new { + --background: #BE332F; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + --background: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} - .label-Select{ - color: var(--dark); - font-size: 15px; - border: none; - font-weight: 400; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); - width: 80%; - padding: 1px 0px; - background-color: var(--light); - border-bottom: var(--cusgray) solid 1px; - border-radius: 0px; - // margin-left: 20px; - margin-left: 30px; - // margin-top: -10px; - // -webkit-appearance: none; - // -moz-appearance: none; - text-indent: 1px; - // text-overflow: ''; - box-shadow: none; - -webkit-box-shadow:none; - -moz-box-shadow: none; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; +.label-Select { + color: var(--dark); + font-size: 15px; + border: none; + font-weight: 400; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + width: 80%; + padding: 1px 0px; + background-color: var(--light); + border-bottom: var(--cusgray) solid 1px; + border-radius: 0px; + // margin-left: 20px; + margin-left: 30px; + // margin-top: -10px; + // -webkit-appearance: none; + // -moz-appearance: none; + text-indent: 1px; + // text-overflow: ''; + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; - :root[dir="ltr"]{ + :root[dir="ltr"] { background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; background-size: 6px 6px, 6px 6px, 2.9em 2.9em; background-repeat: no-repeat; padding-right: 20px; - } - :root[dir="rtl"]{ - background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); - background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; - background-size: 6px 6px, 6px 6px, 2.9em 2.9em; - background-repeat: no-repeat; - padding-left: 20px; - } + } + + :root[dir="rtl"] { + background-image: linear-gradient(-135deg, #999 50%, transparent 50%), linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); + background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; + background-size: 6px 6px, 6px 6px, 2.9em 2.9em; + background-repeat: no-repeat; + padding-left: 20px; + } } -.label{ - font-size: 16px; - // margin-left: 15px; - color: #a2a5a6 !important; - display: block; - overflow: hidden; - -webkit-box-flex: 1; - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; - /* font-size: inherit; */ - // text-overflow: ellipsis; - // white-space: nowrap; - white-space: normal; - // padding-top: 10px; - padding: 5px 0px; - padding-left: 10px !important; - margin: 10px auto; - :root[dir="ltr"]{ - font-family: var(--fontFamilySemiBoldEN) !important; - } - :root[dir="rtl"]{ - font-family: var(--fontFamilyIOSAR) !important; - font-weight: bold; - } +.label { + font-size: 16px; + // margin-left: 15px; + color: #a2a5a6 !important; + display: block; + overflow: hidden; + -webkit-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + /* font-size: inherit; */ + // text-overflow: ellipsis; + // white-space: nowrap; + white-space: normal; + // padding-top: 10px; + padding: 5px 0px; + padding-left: 10px !important; + margin: 10px auto; + + :root[dir="ltr"] { + font-family: var(--fontFamilySemiBoldEN) !important; + } + + :root[dir="rtl"] { + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + } } -.Field-en{ +.Field-en { border-radius: 30px; - border: 1px solid #a2a5a6!important; + border: 1px solid #a2a5a6 !important; margin-bottom: 20px; - padding-left: 20px !important; + padding-left: 20px !important; padding-top: 6px !important; color: #999999 !important; } -.Field-ar{ +.Field-ar { border-radius: 30px; - border: 1px solid #a2a5a6!important; + border: 1px solid #a2a5a6 !important; margin-bottom: 20px; - padding-right: 20px !important; + padding-right: 20px !important; padding-top: 6px !important; color: #999999 !important; -} - - - +} \ No newline at end of file diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 463eb444..159c4842 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -322,8 +322,7 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG, - feildsList[i].REQ_COL_TIP + feildsList[i].REQUIRED_FLAG ); } else if (feildsList[i].FORMAT_TYPE == "N") { // number @@ -334,8 +333,7 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG, - feildsList[i].REQ_COL_TIP + feildsList[i].REQUIRED_FLAG ); } else if (feildsList[i].FORMAT_TYPE == "X") { // standard date @@ -354,8 +352,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } else { this.dateInput = new DateInput( @@ -366,8 +363,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -386,8 +382,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } else { this.datetimeInput = new DateTimeInput( @@ -398,8 +393,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } const elem = document.getElementById( @@ -429,8 +423,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } else { this.timeInput = new TimeInput( @@ -441,8 +434,7 @@ export class SubmitAbsenceComponent implements OnInit { feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG, - this.direction, - feildsList[i].REQ_COL_TIP + this.direction ); } } @@ -456,8 +448,7 @@ export class SubmitAbsenceComponent implements OnInit { defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG, - feildsList[i].REQ_COL_TIP + feildsList[i].REQUIRED_FLAG ); } else { this.selectInput = new SelectInput( @@ -467,8 +458,7 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG, - feildsList[i].REQ_COL_TIP + feildsList[i].REQUIRED_FLAG ); this.fillDropdownList( diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss index 555a530f..4560ae98 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss @@ -1,3 +1,3 @@ -.header-toolbar-new{ - --background: #024d71; - } \ No newline at end of file +.header-toolbar-new { + --background: #BE332F; +} \ No newline at end of file diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 45f06cea..ad790756 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -1,12 +1,12 @@ - + -
@@ -21,15 +21,15 @@
-
+

- + - + {{ts.trPK('userProfile','title')}} @@ -43,7 +43,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} --> - + @@ -113,38 +113,22 @@ - - - - - - - - +
+ +
-
+ -
@@ -158,15 +142,15 @@
-
+

- + - + {{ts.trPK('userProfile','title')}} @@ -180,7 +164,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} --> - + @@ -272,31 +256,14 @@ --> - - - - - - - - - - - - -
diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss index bfd51635..7a723022 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss @@ -1,14 +1,15 @@ .colorBG { - --background: #f0efef; + --background: #f0efef; } + .header-div { - background: #024d71; - color: var(--light); - text-transform: capitalize; - display: block; - position: relative; - height: 210px; - margin-bottom: 60px; + background: #BE332F; + color: var(--light); + text-transform: capitalize; + display: block; + position: relative; + height: 210px; + margin-bottom: 60px; } @@ -16,227 +17,230 @@ .chart-modal .modal-Wrapper { --background: rgb(116, 108, 108) !important; - --border-color:white!important ; - width: 85%!important ; - height: 40px !important ; - - } + --border-color: white !important; + width: 85% !important; + height: 40px !important; - .navbar{ - font-size: 10px !important; - --background: #024d71 !important; - color: aliceblue !important; -// margin-top: 10px !important; +} - } +.navbar { + font-size: 10px !important; + --background: #BE332F !important; + color: aliceblue !important; + // margin-top: 10px !important; - .menu{ - // margin-left:330px !important; - margin-top: 0px !important; - font-size: 35px !important; - background: #024d71; - color: aliceblue; - margin-left: 0px !important; +} - } +.menu { + // margin-left:330px !important; + margin-top: 0px !important; + font-size: 35px !important; + background: #BE332F; + color: aliceblue; + margin-left: 0px !important; - .person{ - - margin-left:100px !important; - margin-top: 0px !important; - font-size: 23px !important; - background: #024d71 !important; - color: aliceblue !important; - - } +} - .grid{ -margin-bottom: 550px !important; -margin-top: 20px !important; -margin-left: 15px !important; -margin-right: 15px !important; -background-color:white !important; -border-radius: 20px !important; -height: 250px !important; - } +.person { - .headerGrid{ - margin-bottom: 550px !important; -margin-top: 80px !important; -margin-left: 15px !important; -margin-right: 15px !important; -background-color:white !important; -border-radius: 20px !important; -height: 250px !important; - } + margin-left: 100px !important; + margin-top: 0px !important; + font-size: 23px !important; + background: #BE332F !important; + color: aliceblue !important; - .bodyGrid{ - margin-bottom: 550px !important; - margin-top: 20px !important; - margin-left: 15px !important; - margin-right: 15px !important; - background-color:white !important; - border-radius: 20px !important; - height: 270px !important; - } - .labelGrid{ - margin-top: -30px !important; - background-color:white !important; - border-radius: 20px !important; - height: 100px !important; - } +} -.ionSliders{ - margin: 0px !important; - padding: 0px !important; +.grid { + margin-bottom: 550px !important; + margin-top: 20px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color: white !important; + border-radius: 20px !important; + height: 250px !important; +} +.headerGrid { + margin-bottom: 550px !important; + margin-top: 80px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color: white !important; + border-radius: 20px !important; + height: 250px !important; } +.bodyGrid { + margin-bottom: 550px !important; + margin-top: 20px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color: white !important; + border-radius: 20px !important; + height: 270px !important; +} - .ionSlide{ - margin-top: 5px !important; - margin-left: 190px !important; - color: black !important; +.labelGrid { + margin-top: -30px !important; + background-color: white !important; + border-radius: 20px !important; + height: 100px !important; +} - } - .dateLable{ +.ionSliders { + margin: 0px !important; + padding: 0px !important; + +} + + +.ionSlide { + margin-top: 5px !important; + margin-left: 190px !important; + color: black !important; + +} + +.dateLable { + + margin-left: 90px !important; + color: black !important; + font-size: small !important; + margin-top: 15px !important; +} - margin-left: 90px !important; - color: black !important; - font-size: small !important; - margin-top: 15px !important; - } // h1{ // font-size: 15px !important; // text-align: center !important; // } -.arrowDropright{ - margin-left:100px !important; - font-size: 20px !important; - color: rgb(168, 165, 165) !important; - margin-top: 15px !important; +.arrowDropright { + margin-left: 100px !important; + font-size: 20px !important; + color: rgb(168, 165, 165) !important; + margin-top: 15px !important; } -.arrowDropleft{ - font-size: 20px !important; + +.arrowDropleft { + font-size: 20px !important; margin-left: 10px !important; margin-top: 15px !important; color: rgb(116, 108, 108) !important; } - .ionLable{ - font-size: 10px !important; - } +.ionLable { + font-size: 10px !important; +} - .number{ +.number { - font-size: 18px !important; - font-weight: bolder !important; - color: black !important; - } + font-size: 18px !important; + font-weight: bolder !important; + color: black !important; +} + +.header-div { + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: #BE332F; + // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); + color: var(--light); + text-transform: capitalize; + + display: block; + position: relative; + height: 210px; + margin-bottom: 60px; + // border-radius: 0px 0px 70px 70px; +} + +.request-heading { + + span { + + text-align: center; - .header-div{ - background:var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: #024d71; - // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); - color:var(--light); - text-transform: capitalize; - display: block; - position: relative; - height: 210px; - margin-bottom:60px; - // border-radius: 0px 0px 70px 70px; - } - - .request-heading { - - span { - - text-align: center; - - display: block; - - padding-top: 8px; - - font-family: workSans-Regular; - - } - + + padding-top: 8px; + + font-family: workSans-Regular; + + } + +} + + + +.result-graph { + + position: relative; + + background: white; + + margin-right: 20px; + + margin-left: 20px; + + margin-top: 20px; + + padding-bottom: 20px; + + border-radius: 20px; + +} + + + + + + + + + + +.result-text-container { + + padding: 0; + + margin: 0; + + position: absolute; + + left: 50%; + + top: 50%; + + display: block; + + text-align: center; + + transform: translate(-50%, -50%); + + h2 { + + font-size: 38px; + + font-family: WorkSans-Bold; + + margin: 0 auto; + + line-height: 36px; + } - - - - .result-graph { - - position: relative; - - background: white; - - margin-right: 20px; - - margin-left: 20px; - - margin-top: 20px; - - padding-bottom: 20px; - - border-radius: 20px; - - } - - - - - - - - - - - .result-text-container { - - padding: 0; - - margin: 0; - - position: absolute; - - left: 50%; - - top: 50%; - + + span { + + width: 125px; + display: block; - - text-align: center; - - transform: translate(-50%, -50%); - - h2 { - - font-size: 38px; - - font-family: WorkSans-Bold; - - margin: 0 auto; - - line-height: 36px; - - } - - span { - - width: 125px; - - display: block; - - margin: 0 auto; - - font-size: 12px; - - font-family: workSans-Regular; - } + + margin: 0 auto; + + font-size: 12px; + + font-family: workSans-Regular; } - \ No newline at end of file +} \ No newline at end of file diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts index d7549ef6..41de9f66 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts @@ -40,7 +40,7 @@ export class MonthlyAttendanceComponent implements OnInit { -public data = { + public data = { datasets: [ @@ -50,9 +50,9 @@ public data = { backgroundColor: [ - '#024d71', + '#BE332F', - '#024d71', + '#BE332F', ], borderWidth: 2 @@ -65,12 +65,12 @@ public data = { ionViewWillEnter() { this.currentMonth = this.sharedData.getSharedData("currentMonth"); console.log(this.currentMonth); - let day = this.currentMonth.split(" "); - this.todayMonth =day[0]; + let day = this.currentMonth.split(" "); + this.todayMonth = day[0]; this.todayYear = day[1]; this.todayYear = parseInt(this.todayYear); - console.log("MONTH: " +this.todayMonth); - console.log("YEAR: " +this.todayYear); + console.log("MONTH: " + this.todayMonth); + console.log("YEAR: " + this.todayYear); this.getSubordinatesAttStatus() } @@ -92,7 +92,7 @@ public data = { } - x(){ + x() { console.log("ENAD CHANge") } diff --git a/Mohem/src/app/authentication/app-update/app-update.component.html b/Mohem/src/app/authentication/app-update/app-update.component.html index 3a878e6e..2c9482cf 100644 --- a/Mohem/src/app/authentication/app-update/app-update.component.html +++ b/Mohem/src/app/authentication/app-update/app-update.component.html @@ -3,7 +3,7 @@
- +

{{ 'general,app-update' | translate }}

@@ -15,7 +15,7 @@ - {{ 'general,update-now' | translate }} diff --git a/Mohem/src/app/authentication/check-user/check-user.component.scss b/Mohem/src/app/authentication/check-user/check-user.component.scss index 0628ac93..0677089d 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.scss +++ b/Mohem/src/app/authentication/check-user/check-user.component.scss @@ -1,8 +1,8 @@ -.header-toolbar{ - --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); +.header-toolbar { + --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%); } -.btnBack{ +.btnBack { background: transparent; } @@ -11,21 +11,22 @@ .login-input { border: none; } -.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; @@ -38,4 +39,5 @@ --min-height: 1.6cm !important; width: 315px; } + /////////////////////////////////////////// \ No newline at end of file diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index bd96c5f7..d0ea3dbc 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -1,7 +1,6 @@ @@ -32,9 +31,9 @@ --> -

{{ts.trPK('login','verify-login-with')}}

-

{{ts.trPK('login','verify-fingerprint')}}

-

{{ts.trPK('login','verify-faceId')}}

+

{{ts.trPK('login','verify-login-with')}}

+

{{ts.trPK('login','verify-fingerprint')}}

+

{{ts.trPK('login','verify-faceId')}}

diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss index 11a47728..ad2206df 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -2,8 +2,12 @@ height: 25vh; } +.rowOutside{ + // margin-top: -37px; -.button-digital-id { +} + +.button-digital-id{ --background: white !important; background: white !important; white-space: normal; @@ -18,21 +22,16 @@ } -.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%; -} - -.p-color { - color: #004D71; - font-weight: bold; -} \ No newline at end of file + } \ No newline at end of file diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index cc1091fd..7c52dfea 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -17,7 +17,7 @@ import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/aut import { LoginModel } from '../models/LoginModel'; import * as moment from 'moment'; import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response'; -// import { NFC } from "@ionic-native/nfc/ngx"; +import { NFC } from "@ionic-native/nfc/ngx"; import { DigitalIdComponent } from '../digital-id/digital-id.component'; import { AppUpdateComponent } from '../app-update/app-update.component'; import { Password } from '../models/password'; @@ -69,7 +69,7 @@ export class ConfirmLoginComponent implements OnInit { public platform: Platform, public modalController: ModalController, public alertController: AlertController, - // private nfc: NFC, + private nfc: NFC, private smsRetriever: SmsRetriever ) { this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); @@ -307,7 +307,7 @@ export class ConfirmLoginComponent implements OnInit { private presentBiometricDialog() { this.faio.show({ title: 'Biometric Authetnciation', // (Android Only) | optional | Default: " Biometric Sign On" - subtitle: 'خدماتي', // (Android Only) | optional | Default: null + subtitle: 'Masader', // (Android Only) | optional | Default: null description: this.ts.trPK('general', 'auth-please'), // optional | Default: null fallbackButtonTitle: this.ts.trPK('general', 'use-pin'), // optional | When disableBackup is false defaults to "Use Pin". disableBackup: true, // optional | default: false @@ -353,20 +353,20 @@ export class ConfirmLoginComponent implements OnInit { } async checkNFCStatus() { - // try { - // let nfcStatus = await this.nfc.enabled(); - // console.log("nfc status >>>>>>>>>>" + nfcStatus); - // this.isNFCAvailable = true; - // } catch (err) { - // console.log("Error reading tag", err); - // if (err === "NO_NFC") { - // this.isNFCAvailable = false; - // } else if (err === "NFC_DISABLED") { - // this.isNFCAvailable = true; - // } else { - // this.isNFCAvailable = false; - // } - // } + try { + let nfcStatus = await this.nfc.enabled(); + console.log("nfc status >>>>>>>>>>" + nfcStatus); + this.isNFCAvailable = true; + } catch (err) { + console.log("Error reading tag", err); + if (err === "NO_NFC") { + this.isNFCAvailable = false; + } else if (err === "NFC_DISABLED") { + this.isNFCAvailable = true; + } else { + this.isNFCAvailable = false; + } + } } public checkSMS() { @@ -380,7 +380,6 @@ export class ConfirmLoginComponent implements OnInit { this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok')) .subscribe((result: SMSCheckResponse) => { if (this.cs.validResponse(result)) { - this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name'); this.businessInfo = { show_business: result.BusinessCardPrivilege, name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En, diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index a1f73ac2..3ed9f510 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -7,9 +7,7 @@
-
-
- +

{{ts.trPK('login','login')}}

@@ -18,13 +16,13 @@
-
- - + +
-
- {{ts.trPK('login','login')}} + -
- +
+ {{ts.trPK('login','login')}} + \ No newline at end of file diff --git a/Mohem/src/app/eit/cei-list/cei-list.component.html b/Mohem/src/app/eit/cei-list/cei-list.component.html index 9b126b87..c3deb1d4 100644 --- a/Mohem/src/app/eit/cei-list/cei-list.component.html +++ b/Mohem/src/app/eit/cei-list/cei-list.component.html @@ -22,7 +22,7 @@
- +

diff --git a/Mohem/src/app/eit/cei-list/cei-list.component.scss b/Mohem/src/app/eit/cei-list/cei-list.component.scss index 610b2dc4..3c61a63f 100644 --- a/Mohem/src/app/eit/cei-list/cei-list.component.scss +++ b/Mohem/src/app/eit/cei-list/cei-list.component.scss @@ -1,330 +1,350 @@ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - - .datetime{ - text-align: center; - font-family: WorkSans-Bold; - margin-left: 47px; - margin-top: -19px; - - } - .iconCalendar{ - margin-left: 30px !important; - width: 22% !important; - height: 26px !important; - margin-top: -69px !important; - margin-bottom: 20px !important; - } - h4 { - font-size: 2.2rem; - 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: #024d71; - 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: #024d71; - text-transform: capitalize; - height: 160px; - // position: relative; - display: block; - margin-bottom: -28px; - } - - .header-toolbar-new{ - --background: #024d71; - } - - .addClass{ - background-color: #024d71; - width: 80px; - height: 80px; - right: 8%; - position: fixed; - color: white; - bottom: 5%; - 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); - } - - .contentEit:before { - position: absolute; + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + +.datetime { + text-align: center; + font-family: WorkSans-Bold; + margin-left: 47px; + margin-top: -19px; + +} + +.iconCalendar { + margin-left: 30px !important; + width: 22% !important; + height: 26px !important; + margin-top: -69px !important; + margin-bottom: 20px !important; +} + +h4 { + font-size: 2.2rem; + 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: #BE332F; + 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: #BE332F; + text-transform: capitalize; + height: 160px; + // position: relative; + display: block; + margin-bottom: -28px; +} + +.header-toolbar-new { + --background: #BE332F; +} + +.addClass { + background-color: #BE332F; + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 5%; + 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); +} + +.contentEit:before { + position: absolute; content: ""; - // background: #024d71; + // background: #BE332F; height: 140px; width: 100%; left: 0; top: 0px; z-index: 1; - } - - .hrClass{ - border-width: 0; - box-sizing: content-box; - border-bottom: 1px solid #e6e6e6; - background: #fff !important; - height: 1px; - } - - //////////////////////////////// - .content:before { - position: absolute; +} + +.hrClass { + border-width: 0; + box-sizing: content-box; + border-bottom: 1px solid #e6e6e6; + background: #fff !important; + height: 1px; +} + +//////////////////////////////// +.content:before { + position: absolute; content: ""; - background: #024d71; + background: #BE332F; height: 140px; width: 100%; left: 0; top: 0px; z-index: 1; - } - - - .colorBG{ - --background: #f0efef; - } - - .Title{ - text-align: center; - color: white; - margin-top: -33px; - font-size: 17px; - } - .title{ - text-align: center; - color: black; - margin-top: 5px; - font-size: 17px; - } - .today-graph{ - display: block !important; - height: 196px; - width: 365px; - /* padding-left: 51px; */ - margin-left: 28px !important; - } - - .headerGrid{ - background-color: white !important; - border: 1px solid #cac8c8 !important; - padding-bottom: 53px; - padding-top: -30px; - margin-left: 13px; - margin-right: 13px; - margin-bottom: 10px; - position: relative; - z-index: 1; - border-radius: 20px; - margin-top: 17px; - } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - margin-bottom: -30px; - - - - } - - .green-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 42px; - } - .green-label-ar{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 15px; - } - .blue-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 13px; - } - .light-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: -26px; - } - .light-label-ar{ - font-size: 15px !important; - margin-right: 7px !important; - margin-left: -26px; - } - - .light-dote{ - background-color: #3CB9D5; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .blue-dote{ - - background-color: #024d71; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .green-dote{ - background-color: #1FA269; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - margin-right: -1px; - } - .col{ - text-align: right; - } - - .gridService{ - - /* margin-top: 87px; */ - border-radius: 10px; - /* margin-bottom: -49px; */ - margin-left: 14px; - margin-right: 14px; - - } - .columns{ - margin: 3px; - margin-bottom: 13px; - background: white; - border-radius: 27px; - padding-left: 30px; - padding-right: 6px; - padding-top: 19px; - padding-bottom: 8px; - border: 1px solid #cac8c8 !important; - } - - - .service{ - font-size: 22px; - color: black; - letter-spacing: 1px; - font-weight: bold; - } - .services{ - - font-size: 12px; - color: black; - } - - .adult-dote{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - - .adult-dote-ar{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 0px; - margin-left: 5px; - } - .child-dote{ - - background-color: #024d71; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - .child-dote-ar{ - background-color: #024d71; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - .infants-dote{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - // margin-bottom: 6px; - } - - .infants-dote-ar{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - .addEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #024d71; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - } - - \ No newline at end of file +} + + +.colorBG { + --background: #f0efef; +} + +.Title { + text-align: center; + color: white; + margin-top: -33px; + font-size: 17px; +} + +.title { + text-align: center; + color: black; + margin-top: 5px; + font-size: 17px; +} + +.today-graph { + display: block !important; + height: 196px; + width: 365px; + /* padding-left: 51px; */ + margin-left: 28px !important; +} + +.headerGrid { + background-color: white !important; + border: 1px solid #cac8c8 !important; + padding-bottom: 53px; + padding-top: -30px; + margin-left: 13px; + margin-right: 13px; + margin-bottom: 10px; + position: relative; + z-index: 1; + border-radius: 20px; + margin-top: 17px; +} + +.result-graph { + font-size: 14px; + margin-left: -48px; + margin-right: 3px; + margin-bottom: -30px; + + + +} + +.green-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 42px; +} + +.green-label-ar { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 15px; +} + +.blue-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 13px; +} + +.light-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: -26px; +} + +.light-label-ar { + font-size: 15px !important; + margin-right: 7px !important; + margin-left: -26px; +} + +.light-dote { + background-color: #3CB9D5; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; +} + +.blue-dote { + + background-color: #BE332F; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; +} + +.green-dote { + background-color: #1FA269; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; + margin-right: -1px; +} + +.col { + text-align: right; +} + +.gridService { + + /* margin-top: 87px; */ + border-radius: 10px; + /* margin-bottom: -49px; */ + margin-left: 14px; + margin-right: 14px; + +} + +.columns { + margin: 3px; + margin-bottom: 13px; + background: white; + border-radius: 27px; + padding-left: 30px; + padding-right: 6px; + padding-top: 19px; + padding-bottom: 8px; + border: 1px solid #cac8c8 !important; +} + + +.service { + font-size: 22px; + color: black; + letter-spacing: 1px; + font-weight: bold; +} + +.services { + + font-size: 12px; + color: black; +} + +.adult-dote { + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; +} + +.adult-dote-ar { + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 0px; + margin-left: 5px; +} + +.child-dote { + + background-color: #BE332F; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; +} + +.child-dote-ar { + background-color: #BE332F; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; +} + +.infants-dote { + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; + // margin-bottom: 6px; +} + +.infants-dote-ar { + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; +} + +.addEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss index 965168f7..b30d6c82 100644 --- a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss +++ b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss @@ -1,263 +1,275 @@ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - - .imgSize { - width: 22px; - height: 22px; - } - - .Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; - } - - .tbData { - font-size: 10px; - } - - .btnBack { - background: transparent; - float: right; - } - - .attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - .submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - - /************************New Design**********************************/ - .notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + +.imgSize { + width: 22px; + height: 22px; +} + +.Header { + font-weight: bold; + color: #c6903e !important; + font-size: 10px; +} + +.tbData { + font-size: 10px; +} + +.btnBack { + background: transparent; + float: right; +} + +.attachmentDiv { + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +.submitNote { + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.approvalList { + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +/************************New Design**********************************/ +.notification-list { + background: none; + background: none; + border-radius: 32px; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + } - - - - - - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - - - - .timeline .timeline-item { - width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - .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; - } - - .line{ - padding-bottom:87px; - } - - .attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #44A7A1; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; - } - - .removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; - } - - .note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - - } - .header-toolbar-new{ - --background: #024d71; - } - .title{ - margin-top: -37px; - margin-left: 85px; - } - .title-ar{ - margin-top: -37px; - margin-right: 101px; - } - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #0ca2de; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - } - - .approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } - \ No newline at end of file +} + + + + + + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + +.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; +} + +.line { + padding-bottom: 87px; +} + +.attachLable { + position: absolute; + top: 0px; + z-index: 0; + background: #30b8c6; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; +} + +.removeLable { + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius: 20px; + +} + +.header-toolbar-new { + --background: #BE332F; +} + +.title { + margin-top: -37px; + margin-left: 85px; +} + +.title-ar { + margin-top: -37px; + margin-right: 101px; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} + +.approvalTitle-ar { + font-weight: bold; + font-size: 16px; + text-align: right; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index f32f7e30..dcd0ec6b 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -1,14 +1,9 @@ - - - - + @@ -16,14 +11,10 @@ -
- {{'general, addAttach' | translate}} - * -
-
+
{{'general, addAttach' | translate}} *
-
+
-
-

{{getPassMnuEntryObj.REQ_TIP}}

-
@@ -203,20 +200,17 @@ - + --> +
- - -
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index 2fcf60d0..64b3805b 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -5,7 +5,7 @@ min-width: 200px; } -.datetime{ +.datetime { // text-align: center; // font-family: WorkSans-Bold; // margin-left: 111px; @@ -14,8 +14,9 @@ margin-left: 47px; margin-top: -19px; - } -.iconCalendar{ +} + +.iconCalendar { // margin-left: -241px; // margin-top: 5px; margin-left: 30px !important; @@ -23,13 +24,15 @@ height: 26px !important; margin-top: -69px !important; margin-bottom: 20px !important; - } +} + h4 { font-size: 2.2rem; text-align: center; color: #000000; } -.grids{ + +.grids { border-radius: 20px !important; background: white; padding-left: 1px; @@ -40,9 +43,9 @@ h4 { padding-left: 13px; padding-right: 13px; border: 1px solid #cac8c8; - } +} - .bgcolor { +.bgcolor { color: white; border-top-right-radius: 19px; @@ -52,24 +55,25 @@ h4 { margin-top: 0; margin-bottom: 0; /* border-radius: 12px !important; */ - background: #024d71; + background: #BE332F; border-bottom: 1px solid #a7a4a4; border-top: 1px solid #cac8c8; margin-left: -13px; margin-right: -13px; } -.colEit{ + +.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; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 18px; + font-size: 12px !important; } .header-div { - - background-color: #024d71; + + background-color: #BE332F; text-transform: capitalize; height: 160px; // position: relative; @@ -77,74 +81,76 @@ h4 { margin-bottom: -28px; } -.header-toolbar-new{ - --background: #024d71; +.header-toolbar-new { + --background: #BE332F; } -.addClass{ - background-color: #024d71; - width: 80px; - height: 80px; - right: 8%; - position: fixed; - color: white; - bottom: 5%; - 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); +.addClass { + background-color: #BE332F; + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 5%; + 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); } .contentEit:before { position: absolute; -content: ""; -// background: #024d71; -height: 140px; -width: 100%; -left: 0; -top: 0px; -z-index: 1; + content: ""; + // background: #BE332F; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; } -.hrClass{ +.hrClass { border-width: 0; - box-sizing: content-box; - border-bottom: 1px solid #e6e6e6; - background: #fff !important; - height: 1px; + box-sizing: content-box; + border-bottom: 1px solid #e6e6e6; + background: #fff !important; + height: 1px; } //////////////////////////////// .content:before { position: absolute; -content: ""; -background: #024d71; -height: 140px; -width: 100%; -left: 0; -top: 0px; -z-index: 1; + content: ""; + background: #BE332F; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; } -.colorBG{ +.colorBG { --background: #f0efef; - } +} -.Title{ +.Title { text-align: center; color: white; margin-top: -33px; font-size: 17px; } -.title{ + +.title { text-align: center; color: black; margin-top: 5px; font-size: 17px; } -.today-graph{ + +.today-graph { display: block !important; height: 196px; width: 365px; @@ -152,202 +158,195 @@ z-index: 1; margin-left: 28px !important; } - .headerGrid{ - // background-color: white !important; - // border: 1px solid #cac8c8 !important; - // border-radius: 20px !important; - // padding-top: 28px; - // padding-bottom: 53px; - // margin-left: 9px; - // margin-right: 13px; - // margin-top: -94px; - // margin-bottom: 10px; - background-color: white !important; - border: 1px solid #cac8c8 !important; - /* padding-top: 28px; */ - padding-bottom: 53px; - padding-top: -30px; - margin-left: 13px; - margin-right: 13px; - /* margin-top: -86px; */ - margin-bottom: 10px; - position: relative; - z-index: 1; - border-radius: 20px; - margin-top: 17px; - } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - margin-bottom: -30px; - - - - } - - .green-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 42px; - } - .green-label-ar{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 15px; - } - .blue-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 13px; - } - .light-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: -26px; - } - .light-label-ar{ - font-size: 15px !important; - margin-right: 7px !important; - margin-left: -26px; - } - - .light-dote{ - background-color: #3CB9D5; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .blue-dote{ - - background-color: #024d71; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .green-dote{ - background-color: #1FA269; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - margin-right: -1px; - } - .col{ - text-align: right; - } - - .gridService{ - - /* margin-top: 87px; */ - border-radius: 10px; - /* margin-bottom: -49px; */ - margin-left: 14px; - margin-right: 14px; - - } - .columns{ - margin: 3px; - margin-bottom: 13px; - background: white; - border-radius: 27px; - padding-left: 30px; - padding-right: 6px; - padding-top: 19px; - padding-bottom: 8px; - border: 1px solid #cac8c8 !important; - } - - - .service{ - font-size: 22px; - color: black; - letter-spacing: 1px; - font-weight: bold; - } - .services{ - - font-size: 12px; - color: black; - } - - .adult-dote{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - - .adult-dote-ar{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 0px; - margin-left: 5px; - } - .child-dote{ - - background-color: #024d71; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - .child-dote-ar{ - background-color: #024d71; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - .infants-dote{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - // margin-bottom: 6px; - } - - .infants-dote-ar{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - - .icon-img { - width: 20px; - height: 20px; - float: right; - margin-top: 20px; - } - - .icon-img-ar { - width: 20px; - height: 20px; - float: left; - margin-top: 20px; - } - - .terms { - text-align: center; - color: #004D71; - font-weight: bold; - } \ No newline at end of file +.headerGrid { + // background-color: white !important; + // border: 1px solid #cac8c8 !important; + // border-radius: 20px !important; + // padding-top: 28px; + // padding-bottom: 53px; + // margin-left: 9px; + // margin-right: 13px; + // margin-top: -94px; + // margin-bottom: 10px; + background-color: white !important; + border: 1px solid #cac8c8 !important; + /* padding-top: 28px; */ + padding-bottom: 53px; + padding-top: -30px; + margin-left: 13px; + margin-right: 13px; + /* margin-top: -86px; */ + margin-bottom: 10px; + position: relative; + z-index: 1; + border-radius: 20px; + margin-top: 17px; +} + +.result-graph { + font-size: 14px; + margin-left: -48px; + margin-right: 3px; + margin-bottom: -30px; + + + +} + +.green-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 42px; +} + +.green-label-ar { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 15px; +} + +.blue-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 13px; +} + +.light-label { + font-size: 15px !important; + margin-left: 7px !important; + margin-right: -26px; +} + +.light-label-ar { + font-size: 15px !important; + margin-right: 7px !important; + margin-left: -26px; +} + +.light-dote { + background-color: #3CB9D5; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; +} + +.blue-dote { + + background-color: #BE332F; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; +} + +.green-dote { + background-color: #1FA269; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; + margin-right: -1px; +} + +.col { + text-align: right; +} + +.gridService { + + /* margin-top: 87px; */ + border-radius: 10px; + /* margin-bottom: -49px; */ + margin-left: 14px; + margin-right: 14px; + +} + +.columns { + margin: 3px; + margin-bottom: 13px; + background: white; + border-radius: 27px; + padding-left: 30px; + padding-right: 6px; + padding-top: 19px; + padding-bottom: 8px; + border: 1px solid #cac8c8 !important; +} + + +.service { + font-size: 22px; + color: black; + letter-spacing: 1px; + font-weight: bold; +} + +.services { + + font-size: 12px; + color: black; +} + +.adult-dote { + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; +} + +.adult-dote-ar { + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 0px; + margin-left: 5px; +} + +.child-dote { + + background-color: #BE332F; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; +} + +.child-dote-ar { + background-color: #BE332F; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; +} + +.infants-dote { + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; + // margin-bottom: 6px; +} + +.infants-dote-ar { + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; +} \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 645166d5..09697be5 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -21,7 +21,7 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo export class EitListComponent implements OnInit { Sdate: any; emp_no: any; - balance:any; + balance: any; //////////////up P_PAGE_NUM: number; P_PAGE_LIMIT: number; @@ -49,22 +49,22 @@ export class EitListComponent implements OnInit { accrualNetInfants: any; accrualUNetChild: any; accrualNetAdult: any; - addButton: string = 'Y'; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, - legend: { display: false }}; - gaugeType = 'full'; + legend: { display: false } + }; + gaugeType = 'full'; accrualBalancesList: any; common: any; direction: string; - // gaugeValue = 11.200; - // gaugeLabel = ""; + // gaugeValue = 11.200; + // gaugeLabel = ""; // tslint:disable-next-line: max-line-length - constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, - private modalCtrl: ModalController, public accrualService: AccrualService, public authService:AuthenticationService,) { + constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, + private modalCtrl: ModalController, public accrualService: AccrualService, public authService: AuthenticationService,) { this.direction = TranslatorService.getCurrentLanguageName(); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); @@ -81,42 +81,42 @@ export class EitListComponent implements OnInit { ngOnInit() { ///////////// - this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON; this.Sdate = new Date().toISOString(); this.getUserDetails(); ////////////////up this.getEITTransactions(); this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false); - // accrualNetInfants - // accrualUNetChild - // accrualNetAdult - if(this.accrualBalancesList){ - this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; - this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; - this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; - } + // accrualNetInfants + // accrualUNetChild + // accrualNetAdult + if (this.accrualBalancesList) { + this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; + this.accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; + } this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult], - backgroundColor: [ - '#1FA269', - '#024d71', - '#3CB9D5', ], - borderWidth: 2 - } - ] - }; + { + data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult], + backgroundColor: [ + '#1FA269', + '#BE332F', + '#3CB9D5',], + borderWidth: 2 + } + ] + }; } - getUserDetails(){ + getUserDetails() { this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { - if (user) { - // this.emp_no=user.EMPLOYEE_NUMBER; - - } - }); + if (user) { + // this.emp_no=user.EMPLOYEE_NUMBER; + + } + }); } public getAccrualBalance() { if (this.Sdate) { @@ -139,11 +139,11 @@ export class EitListComponent implements OnInit { } handleAccrualResult(result) { if (this.cs.validResponse(result)) { - this.balance=result.GetAccrualBalancesList; + this.balance = result.GetAccrualBalancesList; this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT; this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT; - this. accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT; - } + this.accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT; + } } /////////////////////////////////// @@ -192,7 +192,7 @@ export class EitListComponent implements OnInit { this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; result.GetEITTransactionList.forEach(vr => { console.log(vr.length); - if(vr.length && vr.length != 0){ + if (vr.length && vr.length != 0) { if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { this.IsReachEnd = true; } else { @@ -229,6 +229,9 @@ export class EitListComponent implements OnInit { this.pAction = EIT_ACTION.UPDATE; this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA); this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION); + // this.fillEitTransactionTable(i); + // this.navCtrl.push("AddEitPage"); + // this.openEit(i); this.openEitNew(i); } deleteEIT(i) { @@ -378,7 +381,7 @@ export class EitListComponent implements OnInit { } else if (item.APPLICATION_COLUMN_NAME == 'PEI_EXTRA_INFO_ID') { obj.peiExtraInfoID = item.NUMBER_VALUE; - } + } } }// end for @@ -567,40 +570,40 @@ export class EitListComponent implements OnInit { this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER); } - -////////////////////////// -// getUserDetails(){ -// this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { -// if (user) { -// this.emp_no=user.EMPLOYEE_NUMBER; - -// } -// }); -// } -// public getAccrualBalance() { -// if (this.Sdate) { -// let today = new Date(this.Sdate); -// let day = today.getDate(); -// let month = today.getMonth() + 1; -// let year = today.getFullYear(); -// let todayDate = month + '/' + day + '/' + year; -// let effectiveDate = todayDate; -// const request = { -// P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, -// P_EFFECTIVE_DATE: effectiveDate -// }; -// this.accrualService -// .getAccrualBalances(request) -// .subscribe((result: any) => { -// this.handleAccrualResult(result); -// }); -// } -// } -// handleAccrualResult(result) { -// if (this.cs.validResponse(result)) { -// this.balance=result.GetAccrualBalancesList; -// } -// } + + ////////////////////////// + // getUserDetails(){ + // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + // if (user) { + // this.emp_no=user.EMPLOYEE_NUMBER; + + // } + // }); + // } + // public getAccrualBalance() { + // if (this.Sdate) { + // let today = new Date(this.Sdate); + // let day = today.getDate(); + // let month = today.getMonth() + 1; + // let year = today.getFullYear(); + // let todayDate = month + '/' + day + '/' + year; + // let effectiveDate = todayDate; + // const request = { + // P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, + // P_EFFECTIVE_DATE: effectiveDate + // }; + // this.accrualService + // .getAccrualBalances(request) + // .subscribe((result: any) => { + // this.handleAccrualResult(result); + // }); + // } + // } + // handleAccrualResult(result) { + // if (this.cs.validResponse(result)) { + // this.balance=result.GetAccrualBalancesList; + // } + // } } ////////////////////////////////up diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index 22a8df4f..c4945b3d 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -1,25 +1,25 @@ - - + + + + {{'eit, update-title' | translate}} + +
- +
{{'worklistMain, notfDetails' | translate}}
-
+
- - @@ -29,7 +29,7 @@
- +
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index b1f77544..15c88f0e 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -1,25 +1,19 @@ -.addEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #024d71; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - } +.addEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} - .editIconDiv{ - right: 10px; - position: absolute; - top: 10px; - } - - .editIconDiv-ar{ - left: 10px; - position: absolute; - top: 10px; - } - - \ No newline at end of file +.editIconDiv { + right: 10px; + position: absolute; + top: 10px; +} \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index b952ba64..98431cd3 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -5,7 +5,6 @@ import { Component, OnInit } from '@angular/core'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; import { EitService } from '../services/eit.service'; -import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; @Component({ selector: 'app-eit-update-list', @@ -24,9 +23,8 @@ export class EitUpdateListComponent implements OnInit { private eitTransactionTbl: any = []; private eitRequest: EitRequest; private descFlex: string; - direction: string; - constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController, private ts: TranslatorService) { + constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); this.itemKey = notification.ITEM_KEY; @@ -34,7 +32,6 @@ export class EitUpdateListComponent implements OnInit { this.functionName = notification.FUNCTION_NAME; this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER; this.descFlex = notification.DESC_FLEX_CONTEXT_CODE; - this.direction = TranslatorService.getCurrentLanguageName(); this.fillEitTransactionTable(); } @@ -70,13 +67,12 @@ export class EitUpdateListComponent implements OnInit { } updateTransactionList(list) { - // list.forEach(element => { - // const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); - // if (index != -1) - // this.eitTransactionTbl.splice(index, 1); - // }); - // this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; - this.eitTransactionTbl = list; + list.forEach(element => { + const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); + if (index != -1) + this.eitTransactionTbl.splice(index, 1); + }); + this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; } resubmitEit() { diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index 4eb8cedc..e5b26660 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -12,8 +12,8 @@ ion-item.custCollabs.item.item-block.item-ios { border-bottom: 1px solid #c8c8c8; } -.header-toolbar-new{ - --background: #024d71; +.header-toolbar-new { + --background: #BE332F; } ion-item.item.item-block { @@ -25,6 +25,7 @@ ion-item.item.item-block { ion-item.childItem.item.item-block { padding: 0px 5px; width: 100%; + ion-label.label.label-md, ion-label.label.label-ios { -webkit-box-shadow: none; @@ -46,9 +47,11 @@ ion-item.item.item-block { padding: 0px 10px; min-height: 40px; } + div.notSelected { padding: 0px 10px; } + // ion-label.label.label-md, // ion-label.label.label-ios { } @@ -56,40 +59,43 @@ ion-item.item.item-block { ion-icon::before { line-height: 2; } -.arrow-down{ + +.arrow-down { position: absolute; top: 0; - right:0; + right: 0; } + // .list-md > .item-block:last-child .item-inner, // .list-ios > .item-block:last-child .item-inner{ // border-bottom: 1px solid #dedede; // } -.span-arrow-en{ +.span-arrow-en { float: right; font-size: 25px; color: grey; transform: rotate(0deg); } -.span-arrow-ar{ +.span-arrow-ar { float: left; font-size: 25px; color: grey; transform: rotate(180deg); } -.arrow-forward{ +.arrow-forward { float: right; font-size: 25px; color: grey; } -.arrow-forward-ar{ + +.arrow-forward-ar { float: left; - font-size: 25px; - color: grey; - -webkit-transform: rotate(180deg); - transform: rotate(180deg); + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); } \ No newline at end of file diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss index 3c6c1fac..93545e99 100644 --- a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss @@ -1,53 +1,52 @@ -.rowBtn{ +.rowBtn { display: flex; flex-direction: row; justify-content: center; align-items: center; } -.Header{ +.Header { color: black !important; font-size: 25px !important; - font-weight: bold !important;; + font-weight: bold !important; + ; margin: 0; text-align: center; margin-bottom: 20px; } -.labelRadio{ +.labelRadio { color: black !important; font-weight: bold !important; padding-bottom: 20px; } -.labelcheck{ +.labelcheck { color: red !important; font-weight: bold !important; margin-bottom: 10px; } -.submitOkButton{ +.submitOkButton { white-space: normal !important; text-transform: capitalize !important; min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #024d71; + --background: #BE332F; width: 100% !important; - color: white!important; + color: white !important; border-radius: 16px !important; } -.submitCancelButton{ + +.submitCancelButton { white-space: normal !important; text-transform: capitalize !important; min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #024d71; + --background: #BE332F; width: 100% !important; - color: white!important; + color: white !important; border-radius: 16px !important; -} - - - +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index 650f4c15..2b8da3ac 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -21,7 +21,7 @@ import { TranslatePipe } from './pipes/translate/translate.pipe'; import { DatePipeTransform } from './pipes/date/date.pipe'; import { AlertControllerService } from './ui/alert/alert-controller.service'; import { DateTimePipe } from './pipes/date-time/date-time.pipe'; -// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; +import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { LaunchNavigator } from '@ionic-native/launch-navigator/ngx'; import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe'; import { BackButtonComponent } from './ui/back-button/back-button.component'; @@ -78,7 +78,7 @@ import { RouterModule } from '@angular/router'; import { HeaderButtonComponent } from './ui/header-button/header-button.component'; import { AppRate } from '@ionic-native/app-rate/ngx'; import { RatingService } from './services/rating/rating.service'; -// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { RateService } from './services/rate/rate.service'; import { MenuService } from './services/menu/menuservice.service'; import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component'; @@ -99,7 +99,7 @@ import { ConfirmLoginComponent } from '../authentication/confirm-login/confirm-l import { WelcomeComponent } from './ui/welcome-login/welcome.component' import { FabButtonComponent } from './ui/fab-button/fab-button.component' import { AttendScanService } from './services/attend-services/attend-scan.service'; -// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { NgCircleProgressModule } from 'ng-circle-progress'; import { CardFilterComponent } from './ui/card-filter/card-filter.component'; import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component'; @@ -108,7 +108,7 @@ import { NgCalendarModule } from 'ionic2-calendar'; import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component'; import { ChartModule } from 'primeng/chart'; import { GenericHeaderComponent } from './ui/generic-header/generic-header.component'; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component'; import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component'; import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component'; @@ -287,7 +287,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; Globalization, SharedDataService, AlertControllerService, - // ThemeableBrowser, + ThemeableBrowser, LaunchNavigator, ProjectsService, NationalityService, @@ -309,14 +309,14 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; Diagnostic, AppRate, RatingService, - // InAppBrowser, + InAppBrowser, RateService, Camera, File, MenuService, OpenNativeSettings, - // BarcodeScanner, - // BackgroundGeolocation, + BarcodeScanner, + BackgroundGeolocation, FileOpener, FilePath, FileChooser, diff --git a/Mohem/src/app/hmg-common/hmg_utils.ts b/Mohem/src/app/hmg-common/hmg_utils.ts index cf15a655..d29b9946 100644 --- a/Mohem/src/app/hmg-common/hmg_utils.ts +++ b/Mohem/src/app/hmg-common/hmg_utils.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Platform } from "@ionic/angular"; declare const cordova: any; @@ -13,10 +13,10 @@ declare const cordova: any; }) export class HMGUtils { constructor( - // public backgroundGeolocation: BackgroundGeolocation, + public backgroundGeolocation: BackgroundGeolocation, public common: CommonService, public ts: TranslatorService, - // private geolocation: Geolocation, + private geolocation: Geolocation, public platform: Platform, public devicePermissionsService:DevicePermissionsService, ) { } @@ -98,32 +98,32 @@ export class HMGUtils { } private getGMSLocation(callBack: Function) { - // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { - // if (resp && (resp.latitude && resp.longitude)) { - // const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; - // const lat = resp.latitude; - // const long = resp.longitude; - // callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) - // } else { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // } - // }, (error) => { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // }); + this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { + if (resp && (resp.latitude && resp.longitude)) { + const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; + const lat = resp.latitude; + const long = resp.longitude; + callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + }, (error) => { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + }); } private getIOSLocation(callBack: Function) { - // this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { - // if (resp && resp.coords.latitude && resp.coords.longitude) { - // const lat = resp.coords.latitude; - // const long = resp.coords.longitude; - // callBack({"latitude":lat, "longitude":long, "isfake":false}) - // } else { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // } - // }).catch(error => { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // }); + this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { + if (resp && resp.coords.latitude && resp.coords.longitude) { + const lat = resp.coords.latitude; + const long = resp.coords.longitude; + callBack({"latitude":lat, "longitude":long, "isfake":false}) + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + }).catch(error => { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + }); } diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts index 1b74485b..29c24f36 100644 --- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts +++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@angular/core'; // import { DevicePermissionsService } from '../device-permissions/device-permissions.service'; import { DomSanitizer } from '@angular/platform-browser'; import { SharedDataService } from '../shared-data-service/shared-data.service'; -// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { AttendanceService } from 'src/app/home/services/attendance.services'; -// import { ZBar } from '@ionic-native/zbar/ngx'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { ZBar } from '@ionic-native/zbar/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { CommonService } from '../common/common.service'; @@ -14,7 +14,7 @@ import { Response } from 'src/app/hmg-common/services/models/response'; import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service'; import { Device } from '@ionic-native/device/ngx'; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { Platform } from '@ionic/angular'; import { ModalController } from '@ionic/angular'; import { FirebaseX } from '@ionic-native/firebase-x/ngx'; @@ -37,17 +37,17 @@ export class AttendScanService { public collection = 'CS'; constructor(private device: Device, - // private zbar: ZBar, - // private geolocation: Geolocation, + private zbar: ZBar, + private geolocation: Geolocation, private attendance_service: AttendanceService, - // private barcodeScanner: BarcodeScanner, + private barcodeScanner: BarcodeScanner, private cameraController: Camera, public sharedData: SharedDataService, private sanitizer: DomSanitizer, private permissions: DevicePermissionsService, public common: CommonService, public ts: TranslatorService, - // public backgroundGeolocation: BackgroundGeolocation, + public backgroundGeolocation: BackgroundGeolocation, public platform: Platform, public modalController: ModalController, public firebasex: FirebaseX, @@ -135,22 +135,22 @@ export class AttendScanService { } scanCode() { - // this.barcodeScanner - // .scan() - // .then(barcodeData => { - // if (!barcodeData.cancelled) { - // this.scannedResult = barcodeData; - // this.deviceID = this.device.uuid; - // if (this.isFakeLocationUsed) { - // this.fakeSwipeAttendance(); - // } else { - // this.swipeAttendance(); - // } - // } - // }) - // .catch(err => { - // console.log('Error', err); - // }); + this.barcodeScanner + .scan() + .then(barcodeData => { + if (!barcodeData.cancelled) { + this.scannedResult = barcodeData; + this.deviceID = this.device.uuid; + if (this.isFakeLocationUsed) { + this.fakeSwipeAttendance(); + } else { + this.swipeAttendance(); + } + } + }) + .catch(err => { + console.log('Error', err); + }); } fakeSwipeAttendance() { diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index d1b3e3e5..0a876022 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -107,15 +107,14 @@ export class AuthenticationService { this.setPublicFields(request); const user = this.getAuthenticatedUser(); - const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false); - if (user && oracleUserName) { + if (user) { const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false); request.P_SESSION_ID = user.P_SESSION_ID; request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER; request.LogInTokenID = user.LogInTokenID; request.TokenID = user.TokenID; - request.P_USER_NAME = oracleUserName; // '1100313582' ALWAYS USER NAME - request.UserName = oracleUserName; // '1100313582' + request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME + request.UserName = userName; // '1100313582' request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; if (AuthenticationService.requireRelogin) { this.sessionTimeOutDialog(); @@ -147,7 +146,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 1.0; + request.VersionID = 3.7; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; @@ -587,7 +586,6 @@ export class AuthenticationService { // tslint:disable-next-line: max-line-length public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable { this.authenticateRequest(request); - request.UserName = localStorage.getItem("user"); if (isPostNoLoad) { return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel); } else { diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts index 9bc59635..68ca3ab7 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts @@ -3,7 +3,6 @@ import { Response } from 'src/app/hmg-common/services/models/response'; import { AuthenticatedUser } from './authenticated-user'; import { PrivilageModel } from './privilage-model'; export class SMSCheckResponse extends Response { - MemberLoginList: any = {}; BasicMemberInformation: any = {}; AuthenticationTokenID: string; MemberInformationList:AuthenticatedUser[]; diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 43893ec6..62bd7c23 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -13,7 +13,7 @@ import { AlertControllerService } from '../../ui/alert/alert-controller.service' //import { Response } from "../models/response"; import { Response } from 'src/app/hmg-common/services/models/response'; import { Location, DatePipe } from '@angular/common'; -// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; +import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx'; import { BrowserConfig } from './models/browser-config'; import { LaunchNavigator, @@ -26,7 +26,7 @@ import { SharedDataService } from '../shared-data-service/shared-data.service'; import { Badge } from '@ionic-native/badge/ngx'; import { LifeCycleService } from '../life-cycle/life-cycle.service'; import { Diagnostic } from '@ionic-native/diagnostic/ngx'; -// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; @Injectable({ providedIn: 'root' @@ -105,7 +105,7 @@ export class CommonService { public toastController: ToastController, public alertController: AlertControllerService, public alertControllerIonic: AlertController, - // public themeableBrowser: ThemeableBrowser, + public themeableBrowser: ThemeableBrowser, public launchNavigation: LaunchNavigator, public platform: Platform, public device: Device, @@ -113,7 +113,7 @@ export class CommonService { public badge: Badge, public lifeCycle: LifeCycleService, public diagnostic: Diagnostic, - // public iab: InAppBrowser, + public iab: InAppBrowser, private menu: MenuController, ) { } @@ -243,19 +243,6 @@ export class CommonService { }); toast.present(); } - - async yellowToast(message: string) { - const toast = await this.toastController.create({ - message: message, - showCloseButton: true, - position: 'top', - duration: 3000, - color: 'warning', - closeButtonText: this.ts.trPK('general', 'close') - }); - toast.present(); - } - async greenToast(message: string) { const toast = await this.toastController.create({ message: message, @@ -696,52 +683,52 @@ export class CommonService { onSuccess?, successURLS?: string[] ) { - // this.platform.ready().then(() => { - // const browser = this.iab.create( - // url, - // '_blank', - // 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no' - // ); - - // // browser.executeScript(...); - - // // browser.insertCSS(...); - // browser.on('loaderror').subscribe(event => { - // if (onFaild) { - // onFaild(); - // } - // browser.close(); - // }); - - // /* - // browser.on('loadstop').subscribe(event => { - // // browser.insertCSS({ code: 'body{color: white;}' }); - // if (onSuccess) { - // onSuccess(); - // } - // }); - // */ - - // browser.on('exit').subscribe(event => { - // if (onExit) { - // onExit(); - // } - // }); - - // browser.on('loadstart').subscribe(event => { - // if (successURLS) { - // successURLS.forEach((successURL, index) => { - // if (event.url && event.url.indexOf(successURL) >= 0) { - // // alert('load start found success url'); - // browser.close(); - // if (onSuccess) { - // onSuccess(); - // } - // } - // }); - // } - // }); - // }); + this.platform.ready().then(() => { + const browser = this.iab.create( + url, + '_blank', + 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no' + ); + + // browser.executeScript(...); + + // browser.insertCSS(...); + browser.on('loaderror').subscribe(event => { + if (onFaild) { + onFaild(); + } + browser.close(); + }); + + /* + browser.on('loadstop').subscribe(event => { + // browser.insertCSS({ code: 'body{color: white;}' }); + if (onSuccess) { + onSuccess(); + } + }); + */ + + browser.on('exit').subscribe(event => { + if (onExit) { + onExit(); + } + }); + + browser.on('loadstart').subscribe(event => { + if (successURLS) { + successURLS.forEach((successURL, index) => { + if (event.url && event.url.indexOf(successURL) >= 0) { + // alert('load start found success url'); + browser.close(); + if (onSuccess) { + onSuccess(); + } + } + }); + } + }); + }); } public imageFromBase64(base64: string) { @@ -1205,6 +1192,7 @@ export class CommonService { this.nav.navigateForward(['/eit/homepage']); } public openMyTeamPage() { + console.log('someeeeeeee'); this.nav.navigateForward(['/my-team/home']); } public openMyTeamDetailPage() { @@ -1362,13 +1350,9 @@ export class CommonService { public openAnnouncement() { this.nav.navigateForward(['/backend-integrations/announcement']); } - public openConcurrentReport(value: boolean) { - const navigationExtras: NavigationExtras = { - queryParams: { - fromHome: value - } - }; - this.nav.navigateForward(['/reports/concurrent-report'], navigationExtras); + public openConcurrentReport() { + + this.nav.navigateForward(['/reports/concurrent-report']); } public openConcurrentTransaction() { @@ -1616,14 +1600,9 @@ export class CommonService { } public setFilterValues(data) { - if (data.length > 0) { - for (const notification of data) { - this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER - } - } else { - this.filterKeys['HRSSA'] = 0; + for (const notification of data) { + this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER } - } @@ -1632,7 +1611,7 @@ export class CommonService { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false, total: 0 @@ -1707,7 +1686,7 @@ export class CommonService { { data: [0, 0, 0, 0, 0, 0, 0, 0], backgroundColor: [ - '#18a169', + '#c6903e', '#3cb9d5', '#114475', '#38c9b3', diff --git a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts index 4a070f8d..8cb6822b 100644 --- a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts +++ b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts @@ -1,64 +1,64 @@ -// import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx'; +import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx'; export class BrowserConfig { - // public static OPTIONS: ThemeableBrowserOptions = { - // statusbar: { - // color: '#ffffffff' - // }, - // toolbar: { - // height: 44, - // color: '#f0f0f0ff' - // }, - // title: { - // color: '#003264ff', - // showPageTitle: true - // }, - // backButton: { - // image: 'back', - // imagePressed: 'back_pressed', - // align: 'left', - // event: 'backPressed' - // }, - // forwardButton: { - // image: 'forward', - // imagePressed: 'forward_pressed', - // align: 'left', - // event: 'forwardPressed' - // }, - // closeButton: { - // image: 'close', - // imagePressed: 'close_pressed', - // align: 'left', - // event: 'closePressed' - // }, - // customButtons: [ - // { - // image: 'share', - // imagePressed: 'share_pressed', - // align: 'right', - // event: 'sharePressed' - // } - // ], - // menu: { - // image: 'menu', - // imagePressed: 'menu_pressed', - // title: 'Test', - // cancel: 'Cancel', - // align: 'right', - // items: [ - // { - // event: 'helloPressed', - // label: 'Hello World!' - // }, - // { - // event: 'testPressed', - // label: 'Test!' - // } - // ] - // }, - // backButtonCanClose: true, - // clearcache: true, - // clearsessioncache: true, - // disallowoverscroll: 'yes' - // }; + public static OPTIONS: ThemeableBrowserOptions = { + statusbar: { + color: '#ffffffff' + }, + toolbar: { + height: 44, + color: '#f0f0f0ff' + }, + title: { + color: '#003264ff', + showPageTitle: true + }, + backButton: { + image: 'back', + imagePressed: 'back_pressed', + align: 'left', + event: 'backPressed' + }, + forwardButton: { + image: 'forward', + imagePressed: 'forward_pressed', + align: 'left', + event: 'forwardPressed' + }, + closeButton: { + image: 'close', + imagePressed: 'close_pressed', + align: 'left', + event: 'closePressed' + }, + customButtons: [ + { + image: 'share', + imagePressed: 'share_pressed', + align: 'right', + event: 'sharePressed' + } + ], + menu: { + image: 'menu', + imagePressed: 'menu_pressed', + title: 'Test', + cancel: 'Cancel', + align: 'right', + items: [ + { + event: 'helloPressed', + label: 'Hello World!' + }, + { + event: 'testPressed', + label: 'Test!' + } + ] + }, + backButtonCanClose: true, + clearcache: true, + clearsessioncache: true, + disallowoverscroll: 'yes' + }; } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 32fb9e17..8ba38b4b 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,13 +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://hmgwebservices.com/'; - // public static host = 'http://10.0.50.241:4444/' // MOE live vpn - // public static host = 'https://uathrmsys.moenergy.gov.sa/' //MOE UAT - public static host = 'https://hrmsys.moenergy.gov.sa/' // MOE ;LIVE - - + // public static host = 'http://mohemm-app-test.srca.org.sa:1010/'; + public static host = 'https://erptstapp.srca.org.sa/' //UAT + // public static host = 'https://masaderapp.srca.org.sa/' //LIVE diff --git a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts index 193ae520..a901e164 100644 --- a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts +++ b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts @@ -1,74 +1,74 @@ import { Injectable } from '@angular/core'; -// import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx'; +import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx'; import { Platform } from '@ionic/angular'; @Injectable({ providedIn: 'root' }) export class HmgBrowserService { - // static options: ThemeableBrowserOptions = { - // statusbar: { - // color: '#ffffffff' - // }, - // toolbar: { - // height: 44, - // color: '#f0f0f0ff' - // }, - // title: { - // color: '#60686b', - // showPageTitle: true - // }, - // backButton: { - // image: 'back', - // imagePressed: 'back_pressed', - // align: 'left', - // event: 'backPressed' - // }, - // forwardButton: { - // image: 'forward', - // imagePressed: 'forward_pressed', - // align: 'left', - // event: 'forwardPressed' - // }, - // closeButton: { - // image: 'close', - // imagePressed: 'close_pressed', - // align: 'left', - // event: 'closePressed' - // }, - // /* - // customButtons: [ - // { - // image: 'share', - // imagePressed: 'share_pressed', - // align: 'right', - // event: 'sharePressed' - // } - // ], - // menu: { - // image: 'menu', - // imagePressed: 'menu_pressed', - // title: 'Test', - // cancel: 'Cancel', - // align: 'right', - // items: [ - // { - // event: 'helloPressed', - // label: 'Hello World!' - // }, - // { - // event: 'testPressed', - // label: 'Test!' - // } - // ] - // }, - // */ - // backButtonCanClose: true - // }; + static options: ThemeableBrowserOptions = { + statusbar: { + color: '#ffffffff' + }, + toolbar: { + height: 44, + color: '#f0f0f0ff' + }, + title: { + color: '#60686b', + showPageTitle: true + }, + backButton: { + image: 'back', + imagePressed: 'back_pressed', + align: 'left', + event: 'backPressed' + }, + forwardButton: { + image: 'forward', + imagePressed: 'forward_pressed', + align: 'left', + event: 'forwardPressed' + }, + closeButton: { + image: 'close', + imagePressed: 'close_pressed', + align: 'left', + event: 'closePressed' + }, + /* + customButtons: [ + { + image: 'share', + imagePressed: 'share_pressed', + align: 'right', + event: 'sharePressed' + } + ], + menu: { + image: 'menu', + imagePressed: 'menu_pressed', + title: 'Test', + cancel: 'Cancel', + align: 'right', + items: [ + { + event: 'helloPressed', + label: 'Hello World!' + }, + { + event: 'testPressed', + label: 'Test!' + } + ] + }, + */ + backButtonCanClose: true + }; - // private browser: ThemeableBrowserObject; + private browser: ThemeableBrowserObject; constructor( - // private themeableBrowser: ThemeableBrowser, + private themeableBrowser: ThemeableBrowser, private platform: Platform ) { } @@ -81,18 +81,18 @@ export class HmgBrowserService { } private registerEvent(eventName: string, event: any) { - // if (this.browser) { - // this.browser.on(eventName).subscribe((data: any) => { - // if (event) { - // event(); - // } - // }); - // } + if (this.browser) { + this.browser.on(eventName).subscribe((data: any) => { + if (event) { + event(); + } + }); + } } public openURLThemable(url: string) { this.platform.ready().then(() => { - // this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options); + this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options); }); } diff --git a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts index 964cf5f0..8bb03e7b 100644 --- a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts +++ b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts @@ -11,5 +11,4 @@ export class MenuEntry { public PROMPT: string; public REQUEST_TYPE: string; public ATTACHMENT_REQUIRED: string; - public REQ_ATTACHMENT_TIP: string; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/translator/translator.service.ts b/Mohem/src/app/hmg-common/services/translator/translator.service.ts index ed4357e1..00870278 100644 --- a/Mohem/src/app/hmg-common/services/translator/translator.service.ts +++ b/Mohem/src/app/hmg-common/services/translator/translator.service.ts @@ -115,18 +115,14 @@ export class TranslatorService { public loadResources(onSuccess: any) { this.platform.ready().then(() => { - var previousLanguage= localStorage.getItem(TranslatorService.LNG_KEY); - if(previousLanguage){ - // .then((previousLanguage: string) => { + this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => { TranslatorService.CURRENT_LANGUAGE = previousLanguage; - document.getElementById('lang').lang = previousLanguage; this.loadTranslationAsset(onSuccess); - }else{ - document.getElementById('lang').lang = 'en'; + }, () => { this.setCurrentLanguageToDefault(); this.loadTranslationAsset(onSuccess); - }; - + }); + }); } @@ -183,24 +179,18 @@ export class TranslatorService { public setCurrentLanguage(language: string) { TranslatorService.CURRENT_LANGUAGE = language; this.events.publish(TranslatorService.CHANGE_EVENT); - localStorage.setItem(TranslatorService.LNG_KEY, language); + this.nativeStorage.setItem(TranslatorService.LNG_KEY, language).then(() => { + }, () => { }); } public switchLanguage() { - // this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => { - var lang = localStorage.getItem(TranslatorService.LNG_KEY) - if(lang){ - this.setCurrentLanguage(this.getNextLanguage(lang)); - }else{ - this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE)); - } - - - //}, () => { - - // }); + this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => { + this.setCurrentLanguage(this.getNextLanguage(previousLanguage)); + }, () => { + this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE)); + }); } private getNextLanguage(currentLanguage: string) { diff --git a/Mohem/src/app/hmg-common/ui/button/button.component.scss b/Mohem/src/app/hmg-common/ui/button/button.component.scss index 40ab6718..ec1fe4de 100644 --- a/Mohem/src/app/hmg-common/ui/button/button.component.scss +++ b/Mohem/src/app/hmg-common/ui/button/button.component.scss @@ -3,10 +3,12 @@ margin-left: 2%; margin-right: 2%; height: 4cm; + box-shadow: 0px 0px 8px 2px #d5d5d5ab; background: white; margin-bottom: 0.3cm; - border-radius: 30px !important; - border: 1.3px solid #8b8b8b; + // border-color: #ececec; + border-style: solid; + border-width: 0.02cm; } // .custom-button:hover { @@ -17,7 +19,7 @@ -.icon { +.icon{ margin-top: 0.7cm; margin-left: 27%; margin-right: 27%; diff --git a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html index 783d9ff0..dd8df64c 100644 --- a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html +++ b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html @@ -2,5 +2,5 @@
- {{text}} + {{text}}
diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html index fee6d4a8..94ab6876 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html @@ -1,7 +1,7 @@
{{value}} - {{text}} + {{text}}
diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts index 8e522d69..c414bc98 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, Input } from '@angular/core'; -import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-card-filter', @@ -12,16 +11,8 @@ export class CardFilterComponent implements OnInit { @Input() active: boolean; @Input() color: string; - direction: string; - constructor() { } - ngOnInit() { - this.direction = TranslatorService.getCurrentLanguageName(); - console.log(this.direction); - if (this.direction == 'ar') { - this.text = 'الموارد البشرية'; - } - } + ngOnInit() {} } diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss index 0278546d..35f168a6 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss @@ -1,111 +1,114 @@ .chart-modal .modal-Wrapper { --background: rgb(116, 108, 108) !important; - --border-color:white!important ; - width: 85%!important ; - height: 40px !important ; - - } - - .navbar{ - font-size: 10px !important; - --background: #024d71 !important; - color: aliceblue !important; - } - - .menu { - margin-top: 0px !important; - font-size: 35px !important; - background: #024d71; - color: aliceblue; - margin-left: 0px !important; - - } - - .person{ - margin-left:100px !important; - margin-top: 0px !important; - font-size: 23px !important; - background: #024d71 !important; - color: aliceblue !important; - - } - - .grid{ - margin-bottom: 550px !important; - margin-top: 20px !important; - margin-left: 15px !important; - margin-right: 15px !important; - background-color:white !important; - border-radius: 20px !important; - height: 250px !important; - } - - .ionSliders{ - margin: 0px !important; - padding: 0px !important; - } - - - .ionSlide{ - margin-top: 5px !important; - margin-left: 190px !important; - color: black !important; - - } - .dateLable{ - - margin-left: 90px !important; - color: black !important; - font-size: small !important; - margin-top: 15px !important; - } + --border-color: white !important; + width: 85% !important; + height: 40px !important; + +} + +.navbar { + font-size: 10px !important; + --background: #BE332F !important; + color: aliceblue !important; +} + +.menu { + margin-top: 0px !important; + font-size: 35px !important; + background: #BE332F; + color: aliceblue; + margin-left: 0px !important; + +} + +.person { + margin-left: 100px !important; + margin-top: 0px !important; + font-size: 23px !important; + background: #BE332F !important; + color: aliceblue !important; + +} + +.grid { + margin-bottom: 550px !important; + margin-top: 20px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color: white !important; + border-radius: 20px !important; + height: 250px !important; +} + +.ionSliders { + margin: 0px !important; + padding: 0px !important; +} + + +.ionSlide { + margin-top: 5px !important; + margin-left: 190px !important; + color: black !important; + +} + +.dateLable { + + margin-left: 90px !important; + color: black !important; + font-size: small !important; + margin-top: 15px !important; +} + // h1{ // font-size: 15px !important; // text-align: center !important; // } -.arrowDropright{ - margin-left:100px !important; - font-size: 20px !important; - color: rgb(168, 165, 165) !important; - margin-top: 15px !important; +.arrowDropright { + margin-left: 100px !important; + font-size: 20px !important; + color: rgb(168, 165, 165) !important; + margin-top: 15px !important; } -.arrowDropleft{ - font-size: 20px !important; + +.arrowDropleft { + font-size: 20px !important; margin-left: 10px !important; margin-top: 15px !important; color: rgb(116, 108, 108) !important; } - .ionLable{ - font-size: 10px !important; - } - - .number{ - - font-size: 18px !important; - font-weight: bolder !important; - color: black !important; - } - - .header-div{ - background:var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: #024d71; - // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); - color:var(--light); - text-transform: capitalize; - - display: block; - position: relative; - height: 210px; - margin-bottom:60px; - // border-radius: 0px 0px 70px 70px; - } - - .advanced-search-modal { - --height: 12cm !important; - --width: 80% !important; - --border-radius: 0.4cm; - } \ No newline at end of file +.ionLable { + font-size: 10px !important; +} + +.number { + + font-size: 18px !important; + font-weight: bolder !important; + color: black !important; +} + +.header-div { + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, (--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + background: #BE332F; + // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); + color: var(--light); + text-transform: capitalize; + + display: block; + position: relative; + height: 210px; + margin-bottom: 60px; + // border-radius: 0px 0px 70px 70px; +} + +.advanced-search-modal { + --height: 12cm !important; + --width: 80% !important; + --border-radius: 0.4cm; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 3dcb3689..26d77f56 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -7,12 +7,14 @@ display: block; text-align: center; transform: translate(-50%, -50%); + h2 { font-size: 25px; font-weight: bold; margin: 0 auto; line-height: 36px; } + span { width: 125px; display: block; @@ -61,19 +63,22 @@ color: rgb(163, 163, 163) !important; } } -.today-graph{ + +.today-graph { display: block; height: 127px; width: 270px; margin-left: -60px; } -.today-graph-ar{ + +.today-graph-ar { display: block; height: 127px; width: 270px; margin-right: -70px; } -.amountlabel{ + +.amountlabel { color: black !important; font-weight: bold !important; font-size: 13px !important; @@ -82,136 +87,153 @@ display: block; text-align: center; } - .rowlabel{ - color: #a3a3a3 !important; - font-size: 13px !important; - font-family: WorkSans-Bold; - display: block; - width: 100%; - text-align: center; - padding: 1px; - } - .grid{ -padding-bottom: -20px !important; -padding-top: -20px !important; -height: 360px !important; - } - .liftcol{ - border-right: 1px solid rgb(163, 163, 163) !important; - } - .liftcol-ar{ - - border-left: 1px solid rgb(163, 163, 163) !important; - } - +.rowlabel { + color: #a3a3a3 !important; + font-size: 13px !important; + font-family: WorkSans-Bold; + display: block; + width: 100%; + text-align: center; + padding: 1px; +} - .rightcol{ +.grid { + padding-bottom: -20px !important; + padding-top: -20px !important; + height: 360px !important; - margin-left: 5px !important; - } - .gridrow{ - border-top: 1px solid rgb(163, 163, 163) !important; - margin-left: 19px; - margin-right: 12px; - } - - .div{ - border: 1px solid #a3a3a3 !important; - border-radius: 10px; - margin-bottom:10px; - } - .div-ar{ - border: 1px solid #a3a3a3 !important; - border-radius: 9px; - width: 264%; - margin-right: -302px; - } - .p0{ - margin-bottom: -13px !important; - color: black !important; - font-weight: bold !important; - font-size: 14px !important; - margin-top: 8px; - text-align: center; - display: block; - width: 100%; - } - .p1{ - margin-bottom: -7px !important; - color: black !important; - font-family: WorkSans-Bold !important; - font-size: 33px; - margin-top: 10px; - text-align: center; - display: block; - width: 100%; - } - .p2{ - font-weight: bold !important; - font-size: 17px !important; - margin-bottom: 43px !important; - margin-top: 0px !important; - color: black !important; - font-weight: bold !important; - text-align: center; - display: block; - width: 100%; - } - .p3{ - color: black !important; - font-weight: bold !important; - font-size: 19px; - margin-top: -43px; - text-align: center; - display: block; - width: 100%; - } +} - .p2-ar{ font-weight: bold !important; - font-size: 17px !important; - margin-bottom: 43px !important; - margin-top: 0px !important; - color: black !important; - font-weight: bold !important; - margin-right: 33px; - } - .p3-ar{ /* margin-bottom: -72px !important; */ - color: black !important; - font-weight: bold !important; - font-size: 19px; - margin-top: -43px; - margin-right: 27px; - } - .p4{ margin-bottom: 56px !important; - margin-top: -26px !important; - color: black !important; - } - // .pdiv{background-color: gray;height: 26px;} - .p5{ - font-size: 14px; - text-align: center; - background-color: #024d71; - color: white; - margin-top: -13px; - margin-bottom: -3px; - height: 21px; - width: 110px; - padding-top: 7px; - padding-bottom: 21px; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - } +.liftcol { + border-right: 1px solid rgb(163, 163, 163) !important; +} - .slider-container { - padding-bottom: 20px; - } - .col{ - border-bottom: 1px solid rgb(204, 204, 204); - border-right: 1px solid rgb(204, 204, 204); - } - .col-ar{ - border-bottom: 1px solid rgb(204, 204, 204); - border-left: 1px solid rgb(204, 204, 204); - } - +.liftcol-ar { + + border-left: 1px solid rgb(163, 163, 163) !important; +} + + +.rightcol { + + margin-left: 5px !important; +} + +.gridrow { + border-top: 1px solid rgb(163, 163, 163) !important; + margin-left: 19px; + margin-right: 12px; +} + +.div { + border: 1px solid #a3a3a3 !important; + border-radius: 10px; + margin-bottom: 10px; +} + +.div-ar { + border: 1px solid #a3a3a3 !important; + border-radius: 9px; + width: 264%; + margin-right: -302px; +} + +.p0 { + margin-bottom: -13px !important; + color: black !important; + font-weight: bold !important; + font-size: 14px !important; + margin-top: 8px; + text-align: center; + display: block; + width: 100%; +} + +.p1 { + margin-bottom: -7px !important; + color: black !important; + font-family: WorkSans-Bold !important; + font-size: 33px; + margin-top: 10px; + text-align: center; + display: block; + width: 100%; +} + +.p2 { + font-weight: bold !important; + font-size: 17px !important; + margin-bottom: 43px !important; + margin-top: 0px !important; + color: black !important; + font-weight: bold !important; + text-align: center; + display: block; + width: 100%; +} + +.p3 { + color: black !important; + font-weight: bold !important; + font-size: 19px; + margin-top: -43px; + text-align: center; + display: block; + width: 100%; +} + +.p2-ar { + font-weight: bold !important; + font-size: 17px !important; + margin-bottom: 43px !important; + margin-top: 0px !important; + color: black !important; + font-weight: bold !important; + margin-right: 33px; +} + +.p3-ar { + /* margin-bottom: -72px !important; */ + color: black !important; + font-weight: bold !important; + font-size: 19px; + margin-top: -43px; + margin-right: 27px; +} + +.p4 { + margin-bottom: 56px !important; + margin-top: -26px !important; + color: black !important; +} + +// .pdiv{background-color: gray;height: 26px;} +.p5 { + font-size: 14px; + text-align: center; + background-color: #BE332F; + color: white; + margin-top: -13px; + margin-bottom: -3px; + height: 21px; + width: 110px; + padding-top: 7px; + padding-bottom: 21px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} + +.slider-container { + padding-bottom: 20px; +} + +.col { + border-bottom: 1px solid rgb(204, 204, 204); + border-right: 1px solid rgb(204, 204, 204); +} + +.col-ar { + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index 12cf5f31..e4d0acf3 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -54,16 +54,16 @@ export class DateInfoModalComponent implements OnInit { public navParams: NavParams, public ts: TranslatorService, public common: CommonService - ) { - this.direction = TranslatorService.getCurrentDirection(); - } + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { console.log(this.TODAYDATE); this.excess = this.TODAYDATE.EXCESS_HRS; this.lateIn = this.TODAYDATE.LATE_IN_HRS; this.shortage = this.TODAYDATE.SHORTAGE_HRS; - this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS ; + this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS; this.scheduleDate = this.TODAYDATE.SCHEDULE_DATE; this.assignData(this.SHIFTDETAILS.GetScheduleShiftsDetailsList[0]); } @@ -94,19 +94,19 @@ export class DateInfoModalComponent implements OnInit { { data: [this.percChart], backgroundColor: [ - '#024d71' + '#BE332F' ], borderWidth: 2 }] }; } -slideChanged(ev) { - this.slides.getActiveIndex().then(index => { - const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index]; - this.assignData(shiftDetails); - }); -} + slideChanged(ev) { + this.slides.getActiveIndex().then(index => { + const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index]; + this.assignData(shiftDetails); + }); + } getHeaderDay(date: any) { if (this.direction === 'ltr') { diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss index cf3ba641..09b14503 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss @@ -1,122 +1,186 @@ -.team-member-container { - +.team-member-container{ + // background: white; + // border-radius: 100px 20px 20px 100px; + // margin-top: 15px; + // font-family: WorkSans-Regular; + // border: 1px solid #ccc; + // border-radius: 15px; + // padding-bottom: 8px; background: white; /* margin-top: 2px; */ font-family: WorkSans-Regular; border: 1px solid #ccc; border-radius: 15px; - padding-bottom: 5px; - margin-bottom: 15px; - box-shadow: 0px 1px 5px #cdcdcd; + padding-bottom: 8px; + margin-bottom: 7px; } -.user-image { +// .user-image-container{ +// position: relative; +// width: 70px; +// height: 70px; +// display: block; +// margin: 0 auto; +// &:before{ +// position: absolute; +// content: ""; +// width: 20px; +// height: 20px; +// border-radius: 20px; +// border: 1px solid white; +// top: 0; +// right: 0; +// background-color: red; +// z-index: 9; +// } +// &.present:before{ +// background-color: green !important; +// } +// } +.user-image{ + // overflow: hidden; + // position: relative; + // display: block; + // width: 100%; + // height: 100%; + // border-radius: 80px; + // border: 1px solid #ccc; + // margin: 0px auto 6px; img { - width: 60px; - height: 60px; - - border-radius: 30px; - margin: 5px; + // width: 100%; + // max-height: 100%; + width: 74%; + max-height: 74%; + margin-top: 4px; + margin-left: 6px; } } -.employee-name { +.employee-name{ display: inline-block; width: 80%; - - .name { - - font-size: 16px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - margin-left: -10px; - margin-top: -5px; - text-align: left; - font-weight: bold; - line-height: 25px; - letter-spacing: -0.64px; - color: #2B353E; - opacity: 1; - font-family: 'Inter' !important; - } - - .title { - - font-family: 'Inter' !important; - line-height: 12px; - letter-spacing: -0.56px; - color: #575757; - opacity: 1; - font-size: 14px; - width: 100%; - text-overflow: ellipsis; - white-space: nowrap; + .name{ + // font-size: 16px; + // color: black; + // // margin: 0; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; // overflow: hidden; - display: block; - margin-left: -10px; - margin-top: -10px; + // margin-left: -10px; + // margin-top: -5px; + // font-family: 'WorkSans-Bold'; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-left: -10px; + margin-top: -5px; + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + } + + .title{ + // font-size: 13px; + // color: #888; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // display: block; + // margin-left: -10px; + // margin-top: -6px; + // color: black; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 12px; + letter-spacing: -0.56px; + color: #575757; + opacity: 1; + font-size: 14px; + width: 100%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + margin-left: -10px; + margin-top: -10px; } } -.employee-name-ar { +.employee-name-ar{ display: inline-block; width: 80%; - - .name { - font-size: 16px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - margin-left: -10px; - margin-top: -5px; - text-align: right; - font-family: 'Inter' !important; - line-height: 25px; - letter-spacing: -0.64px; - color: #2B353E; - opacity: 1; - font-weight: bold; - } - - .title { - - font-family: 'Inter' !important; - line-height: 12px; - letter-spacing: -0.56px; - color: #575757; - opacity: 1; - font-size: 14px; - width: 100%; - text-overflow: ellipsis; - white-space: nowrap; + .name{ + // font-size: 16px; + // color: black; + // // margin: 0; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; // overflow: hidden; - display: block; - margin-left: -10px; - margin-top: -10px; + // margin-left: -10px; + // margin-top: -5px; + // font-family: 'WorkSans-Bold'; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-left: -10px; + margin-top: -5px; + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + } + + .title{ + // font-size: 13px; + // color: #888; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // display: block; + // margin-left: -10px; + // margin-top: -6px; + // color: black; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 12px; + letter-spacing: -0.56px; + color: #575757; + opacity: 1; + font-size: 14px; + width: 100%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + margin-left: -10px; + margin-top: -10px; } } - -.image-container { +.image-container{ width: 20%; display: inline-block; text-align: center; vertical-align: top; margin-top: 5px; - position: relative; - top: 12px; } - -.swipe-information { +.swipe-information{ color: #888; font-size: 12px; border-top: 1px solid #ccc; padding-top: 6px; margin-top: 6px; - .check-in { font-size: 12px; - margin-right: 15px; + margin-right: 15px; } } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss index c647b927..ec6ceba7 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss @@ -1,31 +1,33 @@ //test - .changeImgBtn{ - margin: 0; - position: absolute; - top: 80%; - left: 53%; - -ms-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); - } - .btnImge{ - // button{ - border-color:transparent !important; - --background: #024d71 !important; - background: #024d71 !important; + .changeImgBtn { + margin: 0; + position: absolute; + top: 80%; + left: 53%; + -ms-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + } - height: 57px !important; - width: 60px !important; - border-radius: 50% !important; - // } - - } -//test - .changeIcon{ - background: #024d71 !important; - border-radius: 50% !important; - width: 73px; - height: 55px; - color: white !important; - width: 80px; - height: 71px; - } \ No newline at end of file + .btnImge { + // button{ + border-color: transparent !important; + --background: #BE332F !important; + background: #BE332F !important; + + height: 57px !important; + width: 60px !important; + border-radius: 50% !important; + // } + + } + + //test + .changeIcon { + background: #BE332F !important; + border-radius: 50% !important; + width: 73px; + height: 55px; + color: white !important; + width: 80px; + height: 71px; + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html index 3b0aae40..40d6516a 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html @@ -12,11 +12,6 @@
- -
- -
-
@@ -24,8 +19,7 @@
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss index e2b7cc5d..43c3212b 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss @@ -1,4 +1,4 @@ -.profile-image-container{ +.profile-image-container { display: block; margin: 7px auto 0; width: 32px; @@ -6,13 +6,15 @@ border-radius: 100%; overflow: hidden; text-align: center; - img{ + + img { display: block; margin: 0 auto; max-width: 100%; } } -.ion-title{ + +.ion-title { color: white; font-size: 0.5cm; font-weight: bold; @@ -21,10 +23,12 @@ text-align: center; line-height: 46px; } + .header-toolbar-new { - --background: #024d71; + --background: #BE332F; } -.setting-conatainer{ + +.setting-conatainer { height: 40px !important; width: 40px !important; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts index f27ee8fd..404710f4 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts @@ -13,7 +13,6 @@ import { TranslatorService } from '../../services/translator/translator.service' styleUrls: ['./generic-header.component.scss'], }) export class GenericHeaderComponent implements OnInit { - @Input() moeImage = true; @Input() userImage = ''; @Input() showImage = false; @Input() showMenu = false; diff --git a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss index 53788c75..559c3087 100644 --- a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss +++ b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss @@ -1,9 +1,10 @@ -.float-left{ +.float-left { float: left; } + ion-menu-button { font-size: 0.8cm; color: white; - background: #024d71; + background: #BE332F; margin: 0 auto; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 6c273a47..105de352 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -1,28 +1,24 @@ .custom-button { background: white; + margin-bottom: 0px; + border: 1px solid #ccc; border-radius: 20px; width: 100%; max-width: 105px; height: 100px; padding: 10px; - min-width: 100px; - margin-bottom: 5px; - box-shadow: 0px 0px 5px #00000029; - margin-top: 2px; + min-width: 96px; } .iconBox { display: block; width: 100%; position: static; - height: 40px; } - -.iconBox img { - margin: 0px auto 10px !important; +.iconBox img{ + margin: 0px auto 10px; display: block; width: 35px; - height: 33px; // max-width: 35%; } @@ -30,12 +26,10 @@ display: block; } - .pClass { - font-size: 8px; + font-size: 9px; text-align: center; margin-top: 10px; - color: #004D71; + color: black; font-weight: bold; - letter-spacing: 0px; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html index e2a6c0ed..f8c66193 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html @@ -1,4 +1,4 @@ -
+
@@ -6,7 +6,7 @@
- {{statsValue}} + {{statsValue}}

{{returnTitle(title)}}

\ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index e4b3a074..301515c1 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -1,15 +1,12 @@ .custom-button { - box-shadow: 0px 0px 5px #00000029; background: white; - margin-bottom: 5px; + margin-bottom: 0px; + border: 1px solid #ccc; border-radius: 20px; width: 200px; max-width: 105px; height: 160px; padding: 10px; - @media screen and (min-width: 200px) and (max-width:300px) { - width: 80px; - } } .iconBox { @@ -22,7 +19,7 @@ // max-width: 45%; // padding-bottom: 5px; // padding-top: 5px; - display: inline-block; + display: block; max-width: 67%; padding-bottom: 9px; padding-top: 5px; @@ -36,8 +33,8 @@ span { font-size: 25px; font-weight: bold; - color: #004D71; - text-align: center; + color: black; + text-align: -webkit-auto; display: block; } } @@ -47,23 +44,13 @@ ion-app[dir="rtl"] .titleBox { } .pClass { - // color: #004D71; - // width: 85%; - // margin-top: 5px; - // font-weight: bold; - // text-align: -webkit-auto; - // display: block; - // font-size: 15px !important; - - - color: #004D71; - width: 100%; + color: black; + width: 85%; margin-top: 5px; font-weight: bold; - text-align: center; + text-align: -webkit-auto; display: block; - font-size: 14px !important; - letter-spacing: 0px; + font-size: 15px !important; } .iconFab { diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html index e655a1a3..d7178526 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html @@ -1,4 +1,4 @@ - +

{{ts.trPK('userProfile','position')}}

-

{{employee.POSITION_NAME}}

+

{{jobName}}

{{ts.trPK('userProfile','grade')}}

diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index fbcf72b5..1e61c866 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -22,7 +22,7 @@ ion-title { .contentBg:before { position: absolute; content: ""; - background: #024d71; + background: #BE332F; height: 140px; width: 100%; left: 0; @@ -123,7 +123,7 @@ $actionBtnSize : 36px; border-radius: $actionBtnSize; margin: 0 auto; display: block; - background-color: #024d71; + background-color: #BE332F; line-height: $actionBtnSize; margin-bottom: 3px; font-family: var(--fontFamilyPoppins-SemiBold, inherit); @@ -195,9 +195,8 @@ $actionBtnSize : 36px; border-radius: 50% !important; // margin-right: 22px; // margin-left: 22px; - margin-left: 30px; - margin-right: 30px; - background-color: #024d71; + margin-left: 19px; + background-color: #BE332F; display: flex; } } @@ -205,7 +204,7 @@ $actionBtnSize : 36px; @media screen and (min-width: 768px) and (max-width:1024px) { .active-Segment { - background: #024d71 !important; + background: #BE332F !important; // padding-left: 17px; // display: flex; width: 11%; @@ -235,10 +234,10 @@ $actionBtnSize : 36px; border-radius: 50% !important; // margin-right: 22px; // margin-left: 22px; - margin-left: 30px; + margin-left: 15px; background: #414040 !important; display: flex; - margin-right: 30px; + } } @@ -312,7 +311,7 @@ $actionBtnSize : 36px; } .search-dropdown { - background: #024d71; + background: #BE332F; ion-select { .select-text { @@ -381,7 +380,7 @@ $actionBtnSize : 36px; .activeArrow { height: 20px; width: 20px; - color: #024d71; + color: #BE332F; } .disabledArrow { @@ -393,7 +392,7 @@ $actionBtnSize : 36px; .activeArrow-ar { height: 20px; width: 20px; - color: #024d71; + color: #BE332F; margin-right: 275px; } @@ -659,14 +658,14 @@ $actionBtnSize : 36px; } .green-label-container { - // border-top: 5px solid #024d71; + // border-top: 5px solid #BE332F; // padding: 1px 0px; // margin: 15px 0px width: 12px; height: 12px; padding-right: -10px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; } @@ -832,9 +831,8 @@ $actionBtnSize : 36px; // color: black !important; // display: block !important; text-align: center; - letter-spacing: -0.52px; - color: #5C6F79; - font-weight: bold; + letter-spacing: -0.64px; + color: #2B353E; opacity: 1; font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 16px; @@ -881,7 +879,7 @@ $actionBtnSize : 36px; width: 22px; height: 20px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; z-index: 9; margin-top: 25px; padding-left: 4px; @@ -891,7 +889,7 @@ $actionBtnSize : 36px; width: 22px; height: 20px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; z-index: 9; margin-top: 25px; padding-right: 4px; @@ -940,17 +938,16 @@ $actionBtnSize : 36px; .name { text-align: center; letter-spacing: -0.84px; - color: #004D71; - font-weight: bold; + color: #2B353E; opacity: 1; - font-family: 'Inter' !important; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 21px; font-size: 21px; } .email { text-align: center; - font-family: 'Inter' !important; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 13px; line-height: 6px; letter-spacing: -0.52px; @@ -961,9 +958,8 @@ $actionBtnSize : 36px; .subTitle { text-align: center; - letter-spacing: -0.56px; - color: #004D71; - font-weight: bold; + letter-spacing: -0.52px; + color: #A2A2A2; opacity: 1; font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 13px; @@ -976,8 +972,7 @@ $actionBtnSize : 36px; line-height: 20px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; - font-weight: bold; + color: #2B353E; opacity: 1; margin-top: 20px; margin-bottom: 2px; @@ -987,10 +982,9 @@ $actionBtnSize : 36px; text-align: left; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 0px; - font-size: 14px; - letter-spacing: -0.56px; - color: #5C6F79; - font-weight: bold; + font-size: 13px; + letter-spacing: -0.52px; + color: #A2A2A2; opacity: 1; } @@ -1000,8 +994,7 @@ $actionBtnSize : 36px; line-height: 5px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; - font-weight: bold; + color: #2B353E; opacity: 1; } @@ -1011,37 +1004,30 @@ $actionBtnSize : 36px; line-height: 20px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; - font-weight: bold; + color: #2B353E; opacity: 1; margin-top: 20px; margin-bottom: 2px; - padding: 5px; - font-weight: bold; } .label1-ar { text-align: right; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 0px; - font-size: 18px; - letter-spacing: -0.56px; - color: #5C6F79; - font-weight: bold; + font-size: 13px; + letter-spacing: -0.52px; + color: #A2A2A2; opacity: 1; - padding: 1px 5px 1px 5px; } .label2-ar { text-align: right; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 5px; - font-size: 18px; + font-size: 16px; letter-spacing: -0.64px; - color: #004D71; - font-weight: bold; + color: #2B353E; opacity: 1; - padding: 1px 5px 1px 5px; } @media screen and (min-width: 768px) and (max-width:1024px) { @@ -1077,7 +1063,7 @@ $actionBtnSize : 36px; width: 23px; height: 23px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; z-index: 9; margin-top: 25px; /* padding-left: 4px; */ @@ -1095,7 +1081,7 @@ $actionBtnSize : 36px; width: 23px; height: 23px; border-radius: 100%; - background-color: #024d71; + background-color: #BE332F; z-index: 9; margin-top: 25px; /* padding-left: 4px; */ @@ -1119,23 +1105,11 @@ $actionBtnSize : 36px; text-align: center; font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 10px; - font-size: 12px; - color: #4D4D4D; - margin-top: -13px; - font-weight: bold; -} - -.btnTitle_ar { - text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - line-height: 10px; - font-size: 16px; + font-size: 11px; color: #4D4D4D; margin-top: -13px; - font-weight: bold; } - .btnDiv { position: relative; display: flex; diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index b6533a44..1ce8c501 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -245,10 +245,10 @@ export class DetailsComponent implements OnInit { this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false); console.log(this.employee); - let jobTitle = this.employee.POSITION_NAME; - // if (jobTitle && jobTitle.length > 1) { - this.jobName = jobTitle; - // } + let jobTitle = this.employee.POSITION_NAME.split('.'); + if (jobTitle && jobTitle.length > 1) { + this.jobName = jobTitle[0] + " " + jobTitle[1]; + } const request = { P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER @@ -449,7 +449,7 @@ export class DetailsComponent implements OnInit { data: [this.absentDays, this.attendedDays], backgroundColor: [ 'black', - '#024d71' + '#BE332F' ], borderWidth: 1, // cutoutPrecentage:20 , @@ -793,7 +793,7 @@ export class DetailsComponent implements OnInit { selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME; selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : ''; selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : ''; - if(!this.isFavorite) { + if (!this.isFavorite) { let confirmBoxhtml = `

Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list


@@ -817,31 +817,31 @@ export class DetailsComponent implements OnInit { confirmBoxhtml , () => { const request = - [ - { - "USER_NAME": this.employee.EMPLOYEE_NUMBER, - "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, - "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, - "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, - "IsFavorite": true - } - ]; + [ + { + "USER_NAME": this.employee.EMPLOYEE_NUMBER, + "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, + "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, + "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, + "IsFavorite": true + } + ]; this.saveUserFavruiteList(request); }, - () => {}); + () => { }); } } else { const request = - [ - { - "USER_NAME": this.employee.EMPLOYEE_NUMBER, - "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, - "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, - "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, - "IsFavorite": false - } - ]; + [ + { + "USER_NAME": this.employee.EMPLOYEE_NUMBER, + "EMPLOYEE_DISPLAY_NAME": this.employee.EMPLOYEE_DISPLAY_NAME, + "EMAIL_ADDRESS": this.employee.EMAIL_ADDRESS, + "EMPLOYEE_IMAGE": this.employee.EMPLOYEE_IMAGE, + "IsFavorite": false + } + ]; this.saveUserFavruiteList(request); } } diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 2d769461..0cbb0cef 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -1,5 +1,6 @@ @@ -39,11 +40,11 @@
- - - + + +
-
+
@@ -51,13 +52,85 @@
- +
{{ts.trPK('myTeam','my-team-members')}}
{{EmployeeTotal}}
- + + + + + + + + + + + + { this.isSearch = true; return (item.EMPLOYEE_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); }); - } else if(this.searchKeySelect === 'User Name'){ + } else if (this.searchKeySelect === 'User Name') { this.empSubordinate = this.arrList.filter((item) => { this.isSearch = true; return (item.EMPLOYEE_NUMBER.toLowerCase().indexOf(val.toLowerCase()) > -1); }); - } else if(this.searchKeySelect === 'Email'){ + } else if (this.searchKeySelect === 'Email') { this.empSubordinate = this.arrList.filter((item) => { this.isSearch = true; return (item.EMPLOYEE_EMAIL_ADDRESS.toLowerCase().indexOf(val.toLowerCase()) > -1); }); } - + } getEmpSubordinate() { @@ -186,57 +186,57 @@ export class HomeComponent implements OnInit { }; this.getEmployeeSubordinatesRequestObject = body; this.myTeamService.getEmployeeSubordinates(body).subscribe((result: any) => { - if (this.common.validResponse(result)) { - if (!this.pageFirstVisit) { - this.pageFirstVisit = true; - this.totalEmployees = result.P_NUM_OF_SUBORDINATES; - } - this.handleEmpResult(result.GetEmployeeSubordinatesList); + if (this.common.validResponse(result)) { + if (!this.pageFirstVisit) { + this.pageFirstVisit = true; + this.totalEmployees = result.P_NUM_OF_SUBORDINATES; } + this.handleEmpResult(result.GetEmployeeSubordinatesList); + } }); } handleEmpResult(result) { - this.EmployeeTotal = result.length; - const lastItemIndex = result.length - 1; - const lastItem = result[lastItemIndex]; - if (lastItem) { - if (lastItem.NO_OF_ROWS === lastItem.ROW_NUM) { - this.isReachEnd = true; - if (this.infiniteScroll) { - this.infiniteScroll.complete(); - } - } else { - this.isReachEnd = false; - if (this.infiniteScroll) { - this.infiniteScroll.complete(); - } + this.EmployeeTotal = result.length; + const lastItemIndex = result.length - 1; + const lastItem = result[lastItemIndex]; + if (lastItem) { + if (lastItem.NO_OF_ROWS === lastItem.ROW_NUM) { + this.isReachEnd = true; + if (this.infiniteScroll) { + this.infiniteScroll.complete(); } - } - if (this.common.hasData(result)) { - this.getEmployeeSubordinatesRequestObject.P_PAGE_NUM++; - if (this.empSubordinate.length === 0) { - this.empSubordinate = result; - } else { - this.empSubordinate = this.empSubordinate.concat(result); + } else { + this.isReachEnd = false; + if (this.infiniteScroll) { + this.infiniteScroll.complete(); } + } + } + if (this.common.hasData(result)) { + this.getEmployeeSubordinatesRequestObject.P_PAGE_NUM++; + if (this.empSubordinate.length === 0) { + this.empSubordinate = result; } else { - this.empSubordinate = []; + this.empSubordinate = this.empSubordinate.concat(result); } - this.arrList = this.empSubordinate; + } else { + this.empSubordinate = []; + } + this.arrList = this.empSubordinate; } doInfinite(infiniteScroll) { if (!this.isReachEnd) { this.myTeamService.getEmployeeSubordinates(this.getEmployeeSubordinatesRequestObject).subscribe((result: any) => { - if (this.common.validResponse(result)) { - this.handleEmpResult(result.GetEmployeeSubordinatesList); - } - this.infiniteScroll.complete(); - }); + if (this.common.validResponse(result)) { + this.handleEmpResult(result.GetEmployeeSubordinatesList); + } + this.infiniteScroll.complete(); + }); } else { if (this.infiniteScroll) { - this.infiniteScroll.complete(); + this.infiniteScroll.complete(); } } } @@ -283,7 +283,7 @@ export class HomeComponent implements OnInit { } } - + // getSuborinatesAttStatus(){ // const request = { @@ -295,7 +295,7 @@ export class HomeComponent implements OnInit { // this.myTeamService.getSuborinatesAttStatus(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> // { // this.handleRespondSuborinatesAttStatusResult(result); - + // }) // } diff --git a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html index 7a6cd979..8adf1dde 100644 --- a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html +++ b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html @@ -14,7 +14,7 @@ - {{ts.trPK('general','from')}} + {{ts.trPK('general','from')}} - {{ts.trPK('general','to')}} + {{ts.trPK('general','to')}} - + {{ts.trPK('work-list','clear-search')}} @@ -60,7 +60,7 @@ -
+
{{formattedData.date}} diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index fb3ba717..16f15270 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -32,7 +32,8 @@ height: 99%; background: #e4e4e4; z-index: 1; - + /* margin-left: -10px; */ + /* z-index: 1; */ } .timelineMain .timelineMain-thumb { @@ -41,6 +42,12 @@ width: 50px; z-index: 2; position: absolute; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } width: 50px; float: right; top: 0px; @@ -48,6 +55,9 @@ .timelineMain .timelineMain-thumb.timelineMain-icon { height: 50px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; transform: scale(0.3); } @@ -260,7 +270,7 @@ ion-title { .contentBg:before { position: absolute; content: ""; - background: #024d71; + background: #BE332F; height: 140px; width: 100%; left: 0; @@ -329,21 +339,12 @@ ion-content { } .filters-row { - margin-top: 20px; + margin-top: 10px; margin-left: 20px; } .filters-row-ar { - margin-top: 20px; - margin-right: 20px; -} - -.worklist-content { - position: relative; -} - -.worklist-content-ar { - position: relative; + margin-top: 15px; margin-right: 20px; } @@ -373,6 +374,7 @@ ion-content { min-height: 200px; margin-bottom: 80px; padding-top: 15px; + margin-right: 20px; } .work-list-container-ar:before { @@ -399,8 +401,6 @@ ion-content { // padding-right: 30px; flex: none; - box-shadow: 0px 0px 3px #cdcdcd; - ion-icon { margin-right: 3px; font-size: 20px; @@ -429,7 +429,7 @@ ion-content { border-radius: 50%; width: 15px; height: 15px; - background-color: #004D71; + background-color: #BE332F; top: 1px; } @@ -448,7 +448,7 @@ ion-content { border-radius: 50%; width: 15px; height: 15px; - background-color: #024d71; + background-color: #be332f; top: 1px; } @@ -463,7 +463,6 @@ ion-content { margin-right: 20px; margin-bottom: 15px; padding-right: 15px; - box-shadow: 0px 0px 3px #cdcdcd; p { font-size: 14px; @@ -505,7 +504,7 @@ ion-content { .text-span-active { font-size: 12px; color: white; - background-color: #024d71; + background-color: #BE332F; width: auto; height: 40px; border: 1px solid; @@ -525,8 +524,8 @@ ion-content { .float-r { float: right; - } - +} + .float-l { float: left; } \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index f92f63d8..b39655b7 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -112,7 +112,7 @@ export class HomeComponent implements OnInit { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false }, @@ -207,9 +207,7 @@ export class HomeComponent implements OnInit { this.data = values.data; this.filters = values.filters; - // const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); - const loadWorkList = true; - + const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); if (loadWorkList) { this.receivedITGCount = false; this.showChart = false; @@ -229,9 +227,7 @@ export class HomeComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); - // var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); - var isWorklistChanged = true; - + var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); if (isWorklistChanged) { this.openNotificationsDashboard() } diff --git a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts index d644d815..cd32d6ec 100644 --- a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts +++ b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts @@ -5,10 +5,10 @@ export class WorkListSubmitterInfoRequest extends Request{ public P_NOTIFICATION_TYPE: string;//string public P_SELECTED_EMPLOYEE_NUMBER: string;//String public P_SELECTED_RESP_ID: Number;//NUMBER -// public P_PAGE_NUM : Number; -// public P_PAGE_LIMIT : Number; -// public P_SEARCH_USER_NAME:String; -// public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; -// public P_SEARCH_EMAIL_ADDRESS:String; +public P_PAGE_NUM : Number; +public P_PAGE_LIMIT : Number; +public P_SEARCH_USER_NAME:String; +public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; +public P_SEARCH_EMAIL_ADDRESS:String; } \ No newline at end of file diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 5c17a101..8c53b0bf 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -43,8 +43,7 @@ export class WorklistMainService { public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY"; public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS"; - // public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; - public static getUserInfo = "Services/ERP.svc/REST/Get_Notification_UserInformation"; + public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS"; public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES"; public static getQutationAnalysisUrl = "Services/ERP.svc/REST/GET_QUOTATION_ANALYSIS"; diff --git a/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.scss b/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.scss index f9e3e21b..00563180 100644 --- a/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.scss +++ b/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.scss @@ -3,39 +3,46 @@ ion-card-content.card-content.card-content-ios { padding: 0px; margin: 0px; } + .col { //border: #dedede solid 1px; padding: 2px !important; text-align: center; font-size: 15px; } + .item-md.item-block .item-inner, .item-ios.item-block .item-inner { padding: 0px !important; } + .itemAH { - padding: 0px !important - ; + padding: 0px !important; font-size: 13px; } + .gridAH { text-align: center; padding: 5px 5px !important; border-radius: 5px; } + .rowAH { white-space: normal; + .col { border: 1px solid #d9d9d9; } } + .Header { font-weight: bold; // font-family: "WorkSans-SemiBold" !important; - color: #1a586d; + color: #c6903e; // padding: 0px !important; // margin: 0px !important; } + .titleH { //background-color:$custgreen; //height: 40px; @@ -45,18 +52,24 @@ ion-card-content.card-content.card-content-ios { border-top-right-radius: 5px; border-top-left-radius: 5px; border-bottom: 0px; + .col { border: 0px; } } + ion-label.label.label-md, ion-label.label.label-ios { margin: 0px; } -.rowAH .col{ + +.rowAH .col { border: 1px solid #d9d9d9; padding: 2px !important; text-align: center; font-size: 15px; } -.ion-card-content{padding:0;} \ No newline at end of file + +.ion-card-content { + padding: 0; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss index 555a530f..4560ae98 100644 --- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss +++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss @@ -1,3 +1,3 @@ -.header-toolbar-new{ - --background: #024d71; - } \ No newline at end of file +.header-toolbar-new { + --background: #BE332F; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts index 6a07340c..2635ee81 100644 --- a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts +++ b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts @@ -32,15 +32,13 @@ export class WorkListDetailsComponent implements OnInit { } ngOnInit() { - // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100; - // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; + this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100; + this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999; - this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - - // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; - // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; - // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; this.getsubmitterInfo(this.WorkListSubmitterInfoObj); this.handleNotificationBody(); diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index db6d06e6..32af393c 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -154,7 +154,7 @@ @@ -327,8 +327,8 @@ + diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index 775a73ef..d23b5b14 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -9,7 +9,7 @@ } ion-radio { - --color-checked: #024d71; + --color-checked: #BE332F; } .center { @@ -247,7 +247,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { } ion-radio { - --color-checked: #024d71; + --color-checked: #BE332F; } .center { @@ -313,7 +313,7 @@ ion-radio { } .isFavLetterActive { - color: #024d71; + color: #BE332F; display: block; width: 60%; float: right; @@ -328,7 +328,7 @@ ion-radio { .searchText { background: transparent; - color: #024d71; + color: #BE332F; font-weight: bold; text-decoration: underline; } diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 2401e872..7be2c1fe 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -73,7 +73,7 @@ @@ -183,8 +183,8 @@ + @@ -217,8 +217,8 @@ + @@ -266,8 +266,8 @@ + @@ -310,16 +310,16 @@
{{'general, submit' | translate}} {{'general, submit' | translate}} - {{'general, cancel' | translate}}
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index c49b464f..14fe5335 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -160,7 +160,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { } ion-radio { - --color-checked: #024d71; + --color-checked: #BE332F; } .center { @@ -228,10 +228,10 @@ ion-radio { } .isFavLetterActive { - // background: #024d71; + // background: #BE332F; // width: 55px; // border-radius: 60px; - color: #024d71; + color: #BE332F; display: block; width: 60%; float: right; @@ -253,7 +253,7 @@ ion-radio { .searchText { background: transparent; - color: #024d71; + color: #BE332F; font-weight: bold; text-decoration: underline; } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index c8e3ad4c..d856fe4d 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -76,10 +76,10 @@

- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index 15fe102f..b18b1bba 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -125,14 +125,11 @@ export class WorkListRfcComponent implements OnInit { if (this.cs.validResponse(result)) { if (result.MessageStatus == 1) { this.cs.sharedService.setSharedData(true, 'loadWorkList'); - let itemType = this.getPassNotificationDetails.ITEM_TYPE; - if (this.cs.filterKeys[itemType] != 0) { - this.cs.filterKeys[itemType] = (this.cs.filterKeys[itemType] - 1) - } - // this.messageSuccess = true; - // setTimeout(() => { + this.messageSuccess = true; + + setTimeout(() => { this.messageSuccess = false; //this.cs.openNotificationPage(); // this.modalCtrl.dismiss(); @@ -141,7 +138,7 @@ export class WorkListRfcComponent implements OnInit { data: "Success" }); - // }, 1000); + }, 5000); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.openNotificationPage(); diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index d52889c3..5a840c1d 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -1,8 +1,8 @@ -
-

{{ts.trPK('general','advanced-search')}}

- -
+
+

{{ts.trPK('general','advanced-search')}}

+ +
@@ -49,7 +49,7 @@ {{ts.trPK('vacation-rule','itemType')}} - {{text}} + HR +
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index f904568a..5ad7c43d 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -105,7 +105,7 @@ button.actionBtn.button.button { .dateActionHistory { display: inline-block; - margin-left: 5px; + margin-left: 0px; text-align: left; } @@ -113,11 +113,11 @@ button.actionBtn.button.button { width: 22px; height: 22px; display: inline-block; - margin: 0px 7px 0px 7px; + margin: 0px 10px 0px 5px; } .deligate { - margin-left: 25px; + // margin-left: 25px; } .actionBtn { @@ -356,7 +356,7 @@ ion-card { .active-Segment { font-size: 0.3cm !important; - background: #44A7A1 !important; + background: #c6903e !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -394,13 +394,4 @@ ion-card { margin: 0; white-space: nowrap; font-size: 10px; -} - -ion-item { - margin: 10px; - border-bottom: 1.5px solid #ececec; -} - -ion-item:last-child { - border: none; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 71f31192..a092b143 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -36,7 +36,6 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; import { IonSlides } from '@ionic/angular'; import { ActivatedRoute } from '@angular/router'; -import * as moment from "moment"; @Component({ selector: "app-worklist-main", @@ -257,16 +256,15 @@ export class WorklistMainComponent implements OnInit { this.WorkListAttachObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; + this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1; this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999; - this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; - // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; - // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = ""; + this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = ""; - this.getsubmitterInfo(this.WorkListSubmitterInfoObj); + // this.getsubmitterInfo(this.WorkListSubmitterInfoObj); this.getNotificationButtons(this.WorkListButtonsObj); @@ -1292,7 +1290,7 @@ export class WorklistMainComponent implements OnInit { showLoading(notificationList) { if (notificationList.length < 0) { return true; - } else if (notificationList.length == 0) { + } else if (notificationList === []) { return false; } else { return true; } } diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss index 77392267..2bde1681 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss @@ -1,7 +1,7 @@ -.header-toolbar{ - --background: #024d71; +.header-toolbar { + --background: #BE332F; } -ion-toggle{ - --background-checked: #024d71; +ion-toggle { + --background-checked: #BE332F; } \ No newline at end of file diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts index 7498fd51..8a4df9c1 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { OfferDiscountService } from '../services/service'; -// import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'app-offer-details', @@ -13,7 +13,7 @@ export class OfferDetailsComponent implements OnInit { public details: any; public direction: String; public related: any; - constructor(public ts: TranslatorService, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { } + constructor(public ts: TranslatorService, private socialSharing: SocialSharing, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { } ngOnInit() { this.direction = TranslatorService.getCurrentDirection(); @@ -45,9 +45,9 @@ export class OfferDetailsComponent implements OnInit { subject: this.stripHtml(offerSubject), files: [this.details.Banner_Image] } - // this.socialSharing.shareWithOptions(options).then((result) => { - // console.log(result); - // }) + this.socialSharing.shareWithOptions(options).then((result) => { + console.log(result); + }) } openRelated(item) { this.cs.sharedService.setSharedData(item, OfferDiscountService.selected_offers); diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index 320de606..fa0495d4 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { Routes, RouterModule } from '@angular/router'; -// import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { IonicModule } from '@ionic/angular'; import { OffersdiscountPage } from './offersdiscount.page'; @@ -54,7 +54,7 @@ const routes: Routes = [ ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent], entryComponents: [FilterComponent], - providers: [OfferDiscountService], + providers: [OfferDiscountService, SocialSharing], }) export class OffersdiscountPageModule { } diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 25848f2d..1407dee2 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -98,7 +98,7 @@ - +
- - - + @@ -16,11 +11,7 @@ -
- {{'general, addAttach' | translate}} - * -
-
+
{{'general, addAttach' | translate}}
@@ -270,7 +261,7 @@
- + {{ (isDelete ? 'general, delete' : 'general, submit') | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss index 37d721c1..ad8fbd92 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -1,264 +1,275 @@ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - - .imgSize { - width: 22px; - height: 22px; - } - - .Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; - } - - .tbData { - font-size: 10px; - } - - .btnBack { - background: transparent; - float: right; - } - - .attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - .submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - - /************************New Design**********************************/ - .notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + +.imgSize { + width: 22px; + height: 22px; +} + +.Header { + font-weight: bold; + color: #c6903e !important; + font-size: 10px; +} + +.tbData { + font-size: 10px; +} + +.btnBack { + background: transparent; + float: right; +} + +.attachmentDiv { + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +.submitNote { + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.approvalList { + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +/************************New Design**********************************/ +.notification-list { + background: none; + background: none; + border-radius: 32px; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + } - - - - - - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - - - - .timeline .timeline-item { - width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - .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; - } - - .line{ - padding-bottom:87px; - } - - .attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #44A7A1; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; - } - - .removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; - } - - .note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - - } - .header-toolbar-new{ - --background: #024d71; - } - .title{ - margin-top: -37px; - margin-left: 85px; - } - .title-ar{ - margin-top: -37px; - margin-right: 101px; - } - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #44A7A1; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - --border-radius: 16px !important; - } - - .approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } - \ No newline at end of file +} + + + + + + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + +.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; +} + +.line { + padding-bottom: 87px; +} + +.attachLable { + position: absolute; + top: 0px; + z-index: 0; + background: #c6903e; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; +} + +.removeLable { + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius: 20px; + +} + +.header-toolbar-new { + --background: #BE332F; +} + +.title { + margin-top: -37px; + margin-left: 85px; +} + +.title-ar { + margin-top: -37px; + margin-right: 101px; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} + +.approvalTitle-ar { + font-weight: bold; + font-size: 16px; + text-align: right; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts index 06597c82..b64746bc 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts @@ -64,8 +64,6 @@ export class ConfirmAddressComponent implements OnInit { filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; isContact: boolean; - isAttachmentGET_MENU: string = 'N'; - constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { this.direction = TranslatorService.getCurrentLanguageName() @@ -80,8 +78,6 @@ export class ConfirmAddressComponent implements OnInit { this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); - this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; - // this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; // if (this.isResubmitEIT) { // this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** @@ -271,7 +267,7 @@ export class ConfirmAddressComponent implements OnInit { //if(this.isResubmitEIT==false){ // let msg: string = this.ts.trPK("eit", "approval-message-success"); // this.cs.presentAlert(msg); - this.cs.greenToastPK("eit", "contact-approval-message-success") + this.cs.greenToastPK("eit", "approval-message-success") // } // this.navCtrl.popToRoot(); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); @@ -609,8 +605,6 @@ export class ConfirmAddressComponent implements OnInit { // } - showToolTip(toolTip: any) { - this.cs.yellowToast(toolTip); - } + } diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html index ce1a1e77..0505227b 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html @@ -1,15 +1,9 @@ - - - - + @@ -17,11 +11,7 @@ -
- {{'general, addAttach' | translate}} - * -
-
+
{{'general, addAttach' | translate}}
@@ -132,7 +122,7 @@
- + {{ 'general, submit' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss index e128105b..ad8fbd92 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss @@ -1,264 +1,275 @@ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - - .imgSize { - width: 22px; - height: 22px; - } - - .Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; - } - - .tbData { - font-size: 10px; - } - - .btnBack { - background: transparent; - float: right; - } - - .attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - .submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - - /************************New Design**********************************/ - .notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + +.imgSize { + width: 22px; + height: 22px; +} + +.Header { + font-weight: bold; + color: #c6903e !important; + font-size: 10px; +} + +.tbData { + font-size: 10px; +} + +.btnBack { + background: transparent; + float: right; +} + +.attachmentDiv { + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +.submitNote { + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.approvalList { + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +/************************New Design**********************************/ +.notification-list { + background: none; + background: none; + border-radius: 32px; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + } - - - - - - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - - - - .timeline .timeline-item { - width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - .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; - } - - .line{ - padding-bottom:87px; - } - - .attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #44A7A1; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; - } - - .removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; - } - - .note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - - } - .header-toolbar-new{ - --background: #024d71; - } - .title{ - margin-top: -37px; - margin-left: 85px; - } - .title-ar{ - margin-top: -37px; - margin-right: 101px; - } - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #44A7A1; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - --border-radius: 16px !important - } - - .approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } - \ No newline at end of file +} + + + + + + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + +.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; +} + +.line { + padding-bottom: 87px; +} + +.attachLable { + position: absolute; + top: 0px; + z-index: 0; + background: #c6903e; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; +} + +.removeLable { + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius: 20px; + +} + +.header-toolbar-new { + --background: #BE332F; +} + +.title { + margin-top: -37px; + margin-left: 85px; +} + +.title-ar { + margin-top: -37px; + margin-right: 101px; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} + +.approvalTitle-ar { + font-weight: bold; + font-size: 16px; + text-align: right; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts index 043704a7..5c9dca61 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts @@ -63,7 +63,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { indexLastObj: any = 0; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; - isAttachmentGET_MENU: string = 'N'; + constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { this.direction = TranslatorService.getCurrentLanguageName() @@ -76,7 +76,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false); - this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; + this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER; this.menuType = this.selMenu.List_Menu.MENU_TYPE; @@ -194,7 +194,7 @@ export class ConfirmBasicDetailsComponent implements OnInit { this.isSubmitBtnClicked = true; // let msg: string = this.ts.trPK("eit", "approval-message-success"); // this.cs.presentAlert(msg); - this.cs.greenToastPK("eit", "basic-approval-message-success"); + this.cs.greenToastPK("eit", "approval-message-success"); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); // this.cs.openProfile('sideMenu'); this.cs.openHome(); @@ -436,9 +436,5 @@ export class ConfirmBasicDetailsComponent implements OnInit { } } - showToolTip(toolTip: any) { - this.cs.yellowToast(toolTip); - } - } diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html index 5fe909cb..0505227b 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html @@ -11,11 +11,7 @@ -
- {{'general, addAttach' | translate}} - * -
-
+
{{'general, addAttach' | translate}}
@@ -126,7 +122,7 @@
- + {{ 'general, submit' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss index 965168f7..b30d6c82 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss @@ -1,263 +1,275 @@ .footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; - } - - .imgSize { - width: 22px; - height: 22px; - } - - .Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; - } - - .tbData { - font-size: 10px; - } - - .btnBack { - background: transparent; - float: right; - } - - .attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - .submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; - } - - .approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; - } - - /************************New Design**********************************/ - .notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; +} + +.imgSize { + width: 22px; + height: 22px; +} + +.Header { + font-weight: bold; + color: #c6903e !important; + font-size: 10px; +} + +.tbData { + font-size: 10px; +} + +.btnBack { + background: transparent; + float: right; +} + +.attachmentDiv { + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.noDataDiv { + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +.submitNote { + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; +} + +.approvalList { + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; +} + +/************************New Design**********************************/ +.notification-list { + background: none; + background: none; + border-radius: 32px; + + ion-item { + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + + .item-date { + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; } + + ion-label, + [item-end] { + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + } - - - - - - - .timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); - } - - .timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; - } - - .timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); - } - - - - .timeline .timeline-item { - width: 40px; - - } - - .timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - .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; - } - - .line{ - padding-bottom:87px; - } - - .attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #44A7A1; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; - } - - .removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; - } - - .note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - - } - .header-toolbar-new{ - --background: #024d71; - } - .title{ - margin-top: -37px; - margin-left: 85px; - } - .title-ar{ - margin-top: -37px; - margin-right: 101px; - } - .confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #0ca2de; - width: 80% !important; - color: white!important; - border-radius: 16px !important; - } - - .approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - - } - .approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; - } - \ No newline at end of file +} + + + + + + +.timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); +} + +.timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ +} + +.timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; +} + +.timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); +} + + + +.timeline .timeline-item { + width: 40px; + +} + +.timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + +} + +.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; +} + +.line { + padding-bottom: 87px; +} + +.attachLable { + position: absolute; + top: 0px; + z-index: 0; + background: #30b8c6; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; +} + +.removeLable { + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; +} + +.note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius: 20px; + +} + +.header-toolbar-new { + --background: #BE332F; +} + +.title { + margin-top: -37px; + margin-left: 85px; +} + +.title-ar { + margin-top: -37px; + margin-right: 101px; +} + +.confirmEitOkButton { + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #BE332F; + width: 80% !important; + color: white !important; + border-radius: 16px !important; + --border-radius: 16px !important; + --box-shadow: none; +} + +.approvalTitle-ar { + font-weight: bold; + font-size: 16px; + text-align: right; + +} + +.approvalTitle { + font-weight: bold; + font-size: 16px; + text-align: left; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts index 05178b59..67113d42 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts @@ -64,7 +64,6 @@ export class ConfirmContactComponent implements OnInit { indexLastObj: any = 0; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; - isAttachmentGET_MENU: string = 'N'; constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) { @@ -80,7 +79,6 @@ export class ConfirmContactComponent implements OnInit { this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false); this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER; - this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; @@ -439,8 +437,4 @@ export class ConfirmContactComponent implements OnInit { } } - showToolTip(toolTip: any) { - this.cs.yellowToast(toolTip); - } - } diff --git a/Mohem/src/app/profile/contact/contact.component.html b/Mohem/src/app/profile/contact/contact.component.html index 4504ec2b..304341b1 100644 --- a/Mohem/src/app/profile/contact/contact.component.html +++ b/Mohem/src/app/profile/contact/contact.component.html @@ -1,11 +1,9 @@ - - - - +
+ + + +
@@ -47,9 +45,8 @@
- + {{'userProfile, update' | translate}} -
\ No newline at end of file diff --git a/Mohem/src/app/profile/contact/contact.component.scss b/Mohem/src/app/profile/contact/contact.component.scss index d67acf74..2a469ebf 100644 --- a/Mohem/src/app/profile/contact/contact.component.scss +++ b/Mohem/src/app/profile/contact/contact.component.scss @@ -116,4 +116,13 @@ select{ position: relative; display: inline-block; +} + +.contact-button { + background: var(--newgreen)!important; + border-radius: 16px; + --background: transparent; + width: 80%; + --border-radius: 16px !important; + --box-shadow: none; } \ No newline at end of file diff --git a/Mohem/src/app/profile/contact/contact.component.ts b/Mohem/src/app/profile/contact/contact.component.ts index 189358a3..5df72271 100644 --- a/Mohem/src/app/profile/contact/contact.component.ts +++ b/Mohem/src/app/profile/contact/contact.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, NgZone } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AddEitResponse } from 'src/app/eit/models/add.eit.response'; import { EitRequest } from 'src/app/eit/models/eit.request'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; @@ -20,7 +20,7 @@ export class ConatactComponent implements OnInit { respID: any; selMenu: any; submitrequest: any; - constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService, public ngzone: NgZone) { + constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService,) { this.direction = TranslatorService.getCurrentLanguageName(); this.selEmp = this.cs.sharedService.getSharedData( MenuResponse.SHARED_SEL_EMP, @@ -40,13 +40,10 @@ export class ConatactComponent implements OnInit { ngOnInit() { - this.ngzone.run(() => { - this.phoneNumbers = []; - this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false); - this.setIsUpdated(); - this.direction = TranslatorService.getCurrentLanguageName(); - this.getObjectValue(); - }) + this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false); + this.setIsUpdated(); + this.direction = TranslatorService.getCurrentLanguageName(); + this.getObjectValue(); } setIsUpdated() { this.phoneNumbers.forEach(element => { @@ -96,14 +93,6 @@ export class ConatactComponent implements OnInit { addNewRow() { this.phoneNumbers.push({ 'PHONE_NUMBER': '', 'PHONE_TYPE': '', 'ACTION': 'NEW_ROW', 'OBJECT_VERSION_NUMBER': null, 'PHONE_ID': null }) } - - ionViewDidLeave() { - this.phoneNumbers = this.phoneNumbers.filter(function( obj ) { - return obj.ACTION !== 'NEW_ROW'; - }); - this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE); - - } deleteRow(row) { row['DELETE_ROW'] = true; // this.phoneNumbers = diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 30f3940c..bfeb8399 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -1,13 +1,15 @@ -ion-col.colBold, ion-col.colBold > label{ - font-weight:bold; +ion-col.colBold, +ion-col.colBold>label { + font-weight: bold; } -.colorBG{ ---background: #f0efef; +.colorBG { + --background: #f0efef; } -.header-div{ + +.header-div { text-transform: capitalize; - background: #024d71; + background: #BE332F; display: block; position: relative; height: 160px; @@ -19,36 +21,38 @@ ion-col.colBold, ion-col.colBold > label{ .menubutton { -background: #f0ecec; -min-height: 39px; -width: 35px !important; -height: 20px; -border-radius: 50%; + background: #f0ecec; + min-height: 39px; + width: 35px !important; + height: 20px; + border-radius: 50%; } -.changeIcon{ - /* background: #c1c1c1; */ - width: 21px; - /* height: 26px; */ - border-radius: 50% !important; - position: relative; - color: #7f8c8d; - height: 35px; +.changeIcon { + /* background: #c1c1c1; */ + width: 21px; + /* height: 26px; */ + border-radius: 50% !important; + position: relative; + color: #7f8c8d; + height: 35px; + - } -.changeImgBtn{ +.changeImgBtn { position: absolute; top: 80%; left: 65%; } -.changeImgBtn-ar{ + +.changeImgBtn-ar { position: absolute; top: 80%; left: 66%; } -.profileImg{ + +.profileImg { width: 160px; height: 160px; display: -webkit-inline-box; @@ -73,27 +77,28 @@ border-radius: 50%; text-align: center; } -.line{ +.line { padding-top: 0px !important; /* margin-bottom: 0px; */ /* margin: 0px; */ border-right: 1px #c5c2c2 solid !important; line-height: 10px !important; - + } + .proTitles { margin: 0; padding: 0; font-size: 16px; text-align: center; font-weight: bolder; - color: white; + color: white; margin-top: -33px; } -.profileGrid{ +.profileGrid { border: #bebbbb solid 1px; border-radius: 9px; padding: 0px; @@ -110,16 +115,17 @@ border-radius: 50%; -.lebl{ +.lebl { color: black; font-size: 14px !important; font-weight: bold !important; padding-top: 9px; padding-left: 5px; - + } -.rowBolds{ + +.rowBolds { color: black !important; font-size: 14px !important; /* padding: 6px !important; */ diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 357464ec..44d0fffb 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -59,8 +59,8 @@
- -
+ +
{{ts.trPK('userProfile','family-members')}} @@ -70,7 +70,7 @@
+ style="background: #2B353E; border-radius: 0px 0px 10px 10px;">