From 312556c03598276eee146db0bd188fe4b353368e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 18 Jul 2019 10:47:52 +0300 Subject: [PATCH 1/4] font style added to app --- Mohem/src/theme/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 0edaf270..056da560 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -36,6 +36,7 @@ } :root { +--ion-font-family: 'WorkSans-Light'; --break-small: 450px; --break-big:565px; //$break-large: 1200px; From a4d0efe6c0f4e673007a3fd1e6ec292f66b2c608 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 18 Jul 2019 12:22:27 +0300 Subject: [PATCH 2/4] Styling changes & improvements --- Mohem/src/app/app.scss | 7 +++---- Mohem/src/app/home/home.page.scss | 1 + Mohem/src/app/uI-elements/date-time.input.ts | 2 +- Mohem/src/app/uI-elements/date.input.ts | 2 +- Mohem/src/app/uI-elements/number.input.ts | 2 +- Mohem/src/app/uI-elements/text-area.input.ts | 2 +- Mohem/src/app/uI-elements/text.input.ts | 4 ++-- Mohem/src/app/uI-elements/time.input.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Mohem/src/app/app.scss b/Mohem/src/app/app.scss index 0afca4c2..7c229875 100644 --- a/Mohem/src/app/app.scss +++ b/Mohem/src/app/app.scss @@ -17,11 +17,10 @@ .main-badge{ position: absolute; right: 16px; - border-radius: 50% !important; - line-height: 2; + border-radius: 60% !important; + line-height: 1.7; margin: auto; top: 0; bottom: 0; - - height: 32px; + height: 28px; } \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 018f5f17..ef3085ba 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -23,6 +23,7 @@ line-height: 2; min-width: auto; min-height: auto; + left: 25px; } .header-div{ background:var(--primary); diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index 03d48ee4..4b623765 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -43,7 +43,7 @@ export class DateTimeInput extends UiElement { // } const template = "" + - " " + this.label + "" + + " " + this.label + "" + // "
" + this.value + "
" + "" + // " "+ diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index 1d8cbcb0..630fa6ac 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -42,7 +42,7 @@ export class DateInput extends UiElement { // " "; "" + - " " + this.label + "" + + " " + this.label + "" + // "
" + this.value + "
" + "" + // " "+ diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts index 346f2e07..da23b7c8 100644 --- a/Mohem/src/app/uI-elements/number.input.ts +++ b/Mohem/src/app/uI-elements/number.input.ts @@ -27,7 +27,7 @@ export class NumberInput extends UiElement { // " "; "" + - "" + this.label + "" + + "" + this.label + "" + " " + " "; diff --git a/Mohem/src/app/uI-elements/text-area.input.ts b/Mohem/src/app/uI-elements/text-area.input.ts index 86a60bea..6f724b74 100644 --- a/Mohem/src/app/uI-elements/text-area.input.ts +++ b/Mohem/src/app/uI-elements/text-area.input.ts @@ -27,7 +27,7 @@ export class TextAreaInput extends UiElement { // " "; "" + - "" + this.label + "" + + "" + this.label + "" + "" + this.value + "" + ""; diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 86d218ce..5a31a96c 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -25,8 +25,8 @@ export class TextInput extends UiElement { const template = // "
" + "" + - " " + this.label + "" + - " " + + " " + this.label + "" + + " " + " "; return template; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 33fec9f1..ca6c7d00 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -38,7 +38,7 @@ export class TimeInput extends UiElement { // "
"; "" + - " " + this.label + "" + + " " + this.label + "" + // "
" + this.value + "
" + "" + // " "+ From 85d28fc27ffc908f4707f5d98b4387931011d6ca Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 18 Jul 2019 15:42:55 +0300 Subject: [PATCH 3/4] My Specialist Issue Resolved --- Mohem/src/app/my-specialist/home/home.component.ts | 5 ++++- Mohem/src/app/my-team/details/details.component.html | 5 +---- Mohem/src/app/my-team/details/details.component.ts | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Mohem/src/app/my-specialist/home/home.component.ts b/Mohem/src/app/my-specialist/home/home.component.ts index 022c0c8f..d820bbaf 100644 --- a/Mohem/src/app/my-specialist/home/home.component.ts +++ b/Mohem/src/app/my-specialist/home/home.component.ts @@ -1,3 +1,4 @@ +import { MyTeamService } from './../../my-team/service/my-team.service'; import { MySpecialistService } from './../service/my-specialist.service'; import { SpecialistResponse } from './../models/specialist.response'; import { Component, OnInit } from '@angular/core'; @@ -134,7 +135,9 @@ export class HomeComponent implements OnInit { } private getSpecialistInfo(i) { // this.navCtrl.push("MyTeamPage", { employee: this.specialistEmpList[i], isSpecialist: true }); - this.cs.openMyTeamPage(); + this.cs.sharedService.setSharedData(this.specialistEmpList[i], MyTeamService.EMPLOYEE_SHARED_DATA); + this.cs.sharedService.setSharedData(true, 'isSpecialist'); + this.cs.openMyTeamDetails(); } doInfinite(infiniteScroll) { if (!this.IsReachEnd) { diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index e13d5938..7b5e8f3c 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -1,10 +1,7 @@ - - - - + {{headerTitle}} - - - - - diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index d1967273..7e13790a 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -291,6 +291,11 @@ ion-card ,ion-card-md ,ion-card-ios { border-top-right-radius: 10px !important; } + +ion-card-content { + background-color: white; +} + ion-card-header{ padding: 0px 10px !important; color: var(--light) !important;