From 9aae74223fe42a6e92883c34a93678bac537d02d Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 7 Aug 2022 12:51:29 +0300 Subject: [PATCH] bug fixes --- Mohem/src/app/app.component.html | 70 +- Mohem/src/app/app.component.scss | 3 +- .../services/connector/connector.service.ts | 4 +- .../stats-button/stats-button.component.scss | 4 +- .../app/notification/home/home.component.scss | 709 ++++++++++-------- .../src/app/payslip/home/home.component.html | 6 +- .../src/app/payslip/home/home.component.scss | 587 ++++++++------- 7 files changed, 722 insertions(+), 661 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index b7e5a64f..2016b3cb 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -4,10 +4,13 @@
- - -
+ +
+
+ +
+
@@ -32,14 +35,14 @@ {{ts.trPK('userProfile','title')}} - + @@ -49,17 +52,16 @@ - +
- - + @@ -69,17 +71,17 @@
- + - + - + - + @@ -126,10 +128,9 @@
- - +
-
+

@@ -156,14 +157,14 @@ {{ts.trPK('userProfile','title')}} - + @@ -172,17 +173,16 @@ {{ts.trPK('myTeam','myTeam-header')}} - +
- - + @@ -192,15 +192,15 @@
- - + - + - + - + -
+
-
+

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

{{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- +
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 1406aede..956c87a2 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -1,21 +1,23 @@ -.rowAccordin{ - border: none; - } -.gridAccordin{ - margin: 10px; - background: #ffffff; - border-radius: 5px; +.rowAccordin { + border: none; +} + +.gridAccordin { + margin: 10px; + background: #ffffff; + border-radius: 5px; } -.colPayslip{ +.colPayslip { border-right: 1px solid #cac8c8; - border-bottom-left-radius: -10px !important; - padding-top: 8px; - padding-bottom: 8px; - margin-left: 8px; - font-size: 12px !important; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 8px; + font-size: 12px !important; } -.colPayslip-ar{ + +.colPayslip-ar { border-left: 1px solid #cac8c8; border-bottom-left-radius: -10px !important; padding-top: 8px; @@ -24,57 +26,61 @@ font-size: 12px !important; } -.colPayslips{ - border-bottom-left-radius: -10px !important; - padding-top: 8px; - padding-bottom: 8px; - margin-left: 18px; - font-size: 12px !important; - } +.colPayslips { + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 18px; + font-size: 12px !important; +} -.label{ +.label { font-size: 15px !important; text-align: center; margin-bottom: 1px; margin-left: 8px; } -.label-bold{ + +.label-bold { font-size: 13px !important; // font-weight: bold !important; font-family: WorkSans-Bold; margin-left: 8px; } -.earingTotH{ - text-align: right; - font-weight: bold; - font-size:20px !important; - padding-right: 15px; + +.earingTotH { + text-align: right; + font-weight: bold; + font-size: 20px !important; + padding-right: 15px; } -.earingTotG{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--green); - +.earingTotG { + text-align: left; + padding-left: 15px; + font-weight: bold; + font-size: 20px !important; + color: var(--green); + } -.earingTotR{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--red); - +.earingTotR { + text-align: left; + padding-left: 15px; + font-weight: bold; + font-size: 20px !important; + color: var(--red); + } -.header-toolbar-new{ + +.header-toolbar-new { --background: #269DB8; } -.colorBG{ - --background: #f0efef; - } + +.colorBG { + --background: #f0efef; +} .header-div { background-color: #269DB8; @@ -83,251 +89,248 @@ position: relative; display: block; margin-bottom: -28px; - } - .Title{ - text-align: center; - color: white; - margin-top: -33px; - font-size: 17px; - } +} - .Imgdiv{ - padding-top: -38px; - margin-top: -32px; - } - .Imgsrc{ - width: 23px; - height: 24px; - /* display: -webkit-inline-box; */ - /* display: inline-flex; */ - overflow: hidden; - background: transparent; - border-radius: 70% !important; - /* position: relative; */ - top: 7px; - margin-left: 344px !important; - margin-top: -46px; - } +.Title { + text-align: center; + color: white; + margin-top: -33px; + font-size: 17px; +} + +.Imgdiv { + padding-top: -38px; + margin-top: -32px; +} -.p{ +.Imgsrc { + width: 23px; + height: 24px; + /* display: -webkit-inline-box; */ + /* display: inline-flex; */ + overflow: hidden; + background: transparent; + border-radius: 70% !important; + /* position: relative; */ + top: 7px; + margin-left: 344px !important; + margin-top: -46px; +} + +.p { font-weight: bold; margin-top: -7px; font-size: 14px; } - - .slidBtn{ - margin-top: 8px; - margin-left: 10px; - background: transparent; - } - .activeArrow{ - height: 26px; - width: 26px; - color: white; - background: transparent !important; - --background: transparent !important; - - - } - .activeArrow-ar{ - height: 26px; - width: 26px; - color: white; - background: transparent !important; - --background: transparent !important; - -webkit-transform: scaleX(-1); - -moz-transform: scaleX(-1); - -o-transform: scaleX(-1); - transform: scaleX(-1); - margin-right: 38px; - margin-left: -45px; - } -.slidbtn{ + +.slidBtn { + margin-top: 8px; + margin-left: 10px; + background: transparent; +} + +.activeArrow { + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + + +} + +.activeArrow-ar { + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); + margin-right: 38px; + margin-left: -45px; +} + +.slidbtn { background: transparent; margin-bottom: -59px; margin-top: 8px; margin-left: 65px; } - .disabledArrow{ - height: 26px; - width: 26px; - color: #908d8d; - background: transparent !important; - --background: transparent !important; - } - .disabledArrow-ar{ - height: 26px; - width: 26px; - color: #908d8d; - background: transparent !important; - --background: transparent !important; - margin-right: 3px; - // margin-left: -124px; - margin-left: -105px; - -webkit-transform: scaleX(-1); - -moz-transform: scaleX(-1); - -o-transform: scaleX(-1); - transform: scaleX(-1); - } - .today-graph{ - display: block !important; - height: 162px; - width: 335px; - /* padding-left: 51px; */ - margin-left: 3px !important; - } - .today-graph-ar{ - display: block !important; - height: 162px; - width: 335px; - margin-right: 45px; - margin-left: -25px !important; +.disabledArrow { + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - } +.disabledArrow-ar { + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; + margin-right: 3px; + // margin-left: -124px; + margin-left: -105px; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); +} - .result-graph-ar{ - font-size: 14px; - margin-right: -48px; - margin-left: 3px; - } - .headerGrid{ - background-color: white !important; - border: 1px solid #cac8c8 !important; - border-radius: 20px !important; - padding-top: 13px; - padding-bottom: 14px; - // margin-left: 26px; - // margin-right: 28px; - margin-left: 19px; - margin-right: 19px; - margin-top: -2px; - margin-bottom: 10px; - padding-right: 21px; - - } - - .result-text-container-ar { - padding: 0; - margin: 0; - position: absolute; - // left: 54%; - left: 45%; - top: 50%; - display: block; - text-align: center; - transform: translate(-50%, -50%); +.today-graph { + display: block !important; + height: 162px; + width: 335px; + /* padding-left: 51px; */ + // margin-left: 3px !important; +} + +.today-graph-ar { + display: block !important; + height: 162px; + width: 335px; + margin-right: 45px; + margin-left: -25px !important; +} + +.result-graph { + font-size: 14px; + position: relative; +} - h2 { +.result-graph-ar { + font-size: 14px; + position: relative; +} + +.headerGrid { + background-color: white !important; + border: 1px solid #cac8c8 !important; + border-radius: 20px !important; + padding-top: 13px; + padding-bottom: 14px; + margin-left: 15px; + margin-right: 15px; + margin-bottom: 10px; + padding-right: 25px; - font-size: 23px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; +} - } +.result-text-container { + padding: 0; + margin: 0px -5px 0px -5px; + position: absolute; + top: 30%; + display: block; + text-align: center; + width: 100%; - span { + h2 { + + font-size: 23px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; - width: 125px; - display: block; - margin: 0 auto; - font-size: 14px; - font-family: workSans-Regular; - } } + span { - .result-text-container { - padding: 0; - margin: 0; - position: absolute; - left: 40%; - top: 50%; + width: 125px; display: block; - text-align: center; - transform: translate(-50%, -50%); + margin: 0 auto; + font-size: 14px; + font-family: workSans-Regular; + } +} - h2 { - font-size: 25px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; +.result-text-container { - } - span { + h2 { + + font-size: 25px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; - width: 125px; - display: block; - margin: 0 auto; - font-size: 15px; - font-family: workSans-Regular; - } } -.green-label{ - font-size: 10px; - margin-top: -13px; + + span { + + width: 125px; + display: block; + margin: 0 auto; + font-size: 15px; + font-family: workSans-Regular; + } +} + +.green-label { + font-size: 10px; + margin-top: -13px; } -.green-amount{ +.green-amount { font-size: 13px; font-family: WorkSans-Bold; margin-top: -3px; } -.blue-label{ +.blue-label { font-size: 10px; margin-top: -13px; - } - - .blue-amount{ - font-size: 13px; - font-family: WorkSans-Bold; - margin-top: -4px; - } +} - .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; - } - - .header{ - - margin-top: -119px; - } - .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: #269DB8; - border-bottom: 1px solid #a7a4a4; - border-top: 1px solid #cac8c8; - margin-left: -13px; - margin-right: -13px; - } - -.rowtable{ +.blue-amount { + font-size: 13px; + font-family: WorkSans-Bold; + margin-top: -4px; +} + +.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; +} + +.header { + + margin-top: -119px; +} + +.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: #269DB8; + border-bottom: 1px solid #a7a4a4; + border-top: 1px solid #cac8c8; + margin-left: -13px; + margin-right: -13px; +} + +.rowtable { padding-top: 0; padding-bottom: 0; margin-top: 0; @@ -337,7 +340,8 @@ margin-right: -13px; } -.rowtables{ + +.rowtables { padding-top: 0; padding-bottom: 0; margin-top: 0; @@ -346,60 +350,67 @@ margin-right: -13px; } -.col{ + +.col { font-size: 15px; font-family: WorkSans-Bold; } -.hrTitle{ - margin-left: 11px !important; + +.hrTitle { + margin-left: 20px !important; font-size: 15px !important; - margin-right: 11px !important; + margin-right: 20px !important; } -.date{ + +.date { font-size: 15px !important; margin-left: 58px; margin-bottom: 12px; padding-right: 5px; } -.div-green{ + +.div-green { // left: 77%; // width: 20%; height: 6px; position: relative; - left: 83%; - bottom: 117px; - color: black; - background-color: #269DB8; - width: 16%; - height: 6px; -} -.div-green-ar{ + left: 83%; + bottom: 117px; + color: black; + background-color: #269DB8; + width: 16%; + height: 6px; +} + +.div-green-ar { // position: relative; - // left: 77%; - // bottom: 117px; - // color: black; - // background-color: #269DB8; - // width: 20%; height: 6px; - position: relative; - left: 4%; - bottom: 117px; - color: black; - background-color: #269DB8; - width: 15%; - height: 6px; -} -.div-blue{ // left: 77%; + // bottom: 117px; + // color: black; + // background-color: #269DB8; // width: 20%; height: 6px; position: relative; - left: 83%; - bottom: 67px; - color: black; - background-color: #269DB8; - width: 16%; - height: 6px; -} -.div-blue-ar{ + left: 4%; + bottom: 117px; + color: black; + background-color: #269DB8; + width: 15%; + height: 6px; +} + +.div-blue { + // left: 77%; + // width: 20%; height: 6px; + position: relative; + left: 83%; + bottom: 67px; + color: black; + background-color: #269DB8; + width: 16%; + height: 6px; +} + +.div-blue-ar { //position: relative; // left: 77%; // bottom: 67px;