From f9b1dade17daded2be0224a4be53cd0861f787d2 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 7 Jul 2021 11:08:03 +0300 Subject: [PATCH 1/2] resolved merged issues --- .../announcement/announcement.component.html | 76 +++++---- .../announcement/announcement.component.scss | 147 +++++++++++++++--- .../announcement/announcement.component.ts | 29 +++- .../work-list-main-itg.component.ts | 19 ++- Mohem/src/theme/styles.scss | 11 +- 5 files changed, 224 insertions(+), 58 deletions(-) diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index b376efb1..7ba86dd6 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -4,52 +4,61 @@ - - -
+ +
- - - - -

{{item.title_EN}}

-

{{item.title_AR}}

-

{{item.body_EN}}

-

{{item.body_EN}}

-

{{item.date}}

+ style="margin: 15px; background: white;"> + + + + +

{{item.date}}

+

{{item.title_EN}}

+

{{item.title_AR}}

+

{{item.body_EN}}

+

{{item.body_EN}}

- + - {{item.title_EN}}
-

{{item.date}}

+

{{item.title_EN}}


+

{{item.date}}

- {{item.title_AR}}
-

{{item.date}}

+ {{item.title_AR}}
+

{{item.date}}

-

{{item.body_EN}}

-

{{item.body_AR}}

+

{{item.body_EN}}

+

{{item.body_AR}}

- - - -

{{item.title_EN}}

-

{{item.body_EN}}

+ + + +

{{item.title_EN}}

+

{{item.body_EN}}

+ +

{{item.title_AR}}

+

{{item.body_AR}}

+

{{item.date}}

+
+
+ + +

{{item.title_EN}}

+

{{item.body_EN}}

-

{{item.title_AR}}

-

{{item.body_AR}}

-

{{item.date}}

+

{{item.title_AR}}

+

{{item.body_AR}}

+

{{item.date}}

-
+
@@ -68,4 +77,11 @@
+ + + + + \ No newline at end of file diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.scss b/Mohem/src/app/backend-integrations/announcement/announcement.component.scss index 2ea2dfbf..1aa39090 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.scss +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.scss @@ -1,31 +1,132 @@ -.image-center{ - width: 100%; - display: block; - margin-left: auto; - margin-right: auto; +.image-center { + width: 100%; + display: block; + margin-left: auto; + margin-right: auto; } -.text-style{ - margin: 5px; +.main-card-image { + width: 100%; + display: block; + margin-left: auto; + margin-right: auto; + position: absolute; + height: 100%; +} +.text-style { + margin: 5px; +} + +.class-dev-close { + // border: 1px solid lightgray; + // border-radius: 30px; +} +.class-dev-open { +} + +.class-item-open { + border: 1px solid lightgray; + border-radius: 30px; + height: 100px; +} +.class-item-close { } -.class-dev-close{ - border: 1px solid lightgray; - border-radius: 30px; +.image-item { + // width: 30%; + // height: 70%; + // margin-top: 30px; + // border: 1px solid white; + // border-radius: 11px; + // margin-bottom: 25px; + width: 100px; + height: 100px; + margin-top: 1px; + border: 5px solid white; + border-radius: 11px; + border-left: 0px; + border-right: 0px; } -.class-dev-open{} -.class-item-open{ - border: 1px solid lightgray; - border-radius: 30px; - height: 100px; +.announcement-items { + border: 1px solid #00000029; + border-radius: 10px; + height: 100px; + box-shadow: 0px 0px 5px #00000000; } -.class-item-close{} -.image-item{ - width: 30%; - height: 70%; - margin-top: 30px; - border: 1px solid white; - border-radius: 11px; - margin-bottom: 25px; +.item-list-h { + font: normal normal 600 14px/11px Poppins; + letter-spacing: -0.56px; + color: #2b353e; + opacity: 1; + padding-bottom: 5px; +} +.item-list-p-title { + font: normal normal medium 11px/16px Poppins; + letter-spacing: -0.44px; + color: #535353; +} +.item-list-date-title { + font: normal normal 600 10px/16px Poppins; + letter-spacing: -0.4px; + color: #7c7c7c; +} + +.item-list-first-h { + font: normal normal bold 23px/24px Poppins; + letter-spacing: -1.38px; + color: #ffffff; + white-space: break-spaces; +} +.item-list-first-p { + font: normal normal normal 12px/17px Poppins; + letter-spacing: -0.12px; + color: #ffffff; +} +.item-list-first-date { + text-align: left; + font: normal normal bold 8px/23px Poppins; + letter-spacing: 0px; + color: #ffffff; } + +.card-style-h { + font: normal normal 600 20px/22px Poppins; + letter-spacing: -0.8px; + color: #2b353e; + margin-bottom: -34px; +} +.card-style-p { + font: normal normal medium 13px/18px Poppins; + letter-spacing: -0.52px; + color: #535353; +} + +.card-style-date { + font: normal normal 600 12px/18px Poppins; + letter-spacing: -0.48px; + color: #7c7c7c; +} + +.main-card-style { + margin: 0px; + position: relative; + min-height: 283px; +} +.main-card-item-list-style { + position: absolute; + bottom: 0px; + --background: transparent; +} +.main-card-label-stle{ + margin: 0px; + padding: 0px; + width: 237px; +} + +.main-card-label-style-all{ + padding: 0px; + margin: 0px; + width: 200px; +} + diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts index 0482f4a5..d9cf6c7d 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.ts +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.ts @@ -1,8 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { detachEmbeddedView } from '@angular/core/src/view'; import { AnnouncementService } from 'src/app/hmg-common/services/announcement-services/announcement.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { IonInfiniteScroll } from '@ionic/angular'; @Component({ selector: 'app-announcement', @@ -10,10 +11,14 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl styleUrls: ['./announcement.component.scss'], }) export class AnnouncementComponent implements OnInit { - public arr: { id: number, title_EN: string, title_AR: string, body_EN: string, body_AR: string, img: string, date: Date, isopen: boolean }[] = []; + public arr: { id: number, title_EN: string, title_AR: string, body_EN: string, body_AR: string, img?: string, date: Date, isopen: boolean }[] = []; public arrList = []; public listOfAnnouncement; direction: string; + public announcementList = []; + public numberOfListLength = 10; + public announcememntCounter = this.numberOfListLength; + @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; constructor( public announcementService: AnnouncementService, @@ -71,10 +76,30 @@ export class AnnouncementComponent implements OnInit { img: this.listOfAnnouncement[i].Banner_Image, isopen: false }; + if ( i < this.numberOfListLength){ + this.announcementList.push(this.arr[i]); + } + } this.arrList = this.arr; } }); } + loadData(event) { + let counter = this.numberOfListLength + this.announcememntCounter; + setTimeout(() => { + event.target.complete(); + for(let i = this.announcememntCounter; i < counter; i++) { + if(this.arrList[i]) { + this.announcementList.push(this.arrList[i]); + this.announcememntCounter ++; + } + } + if (this.announcememntCounter >= this.arrList.length) { + event.target.disabled = true; + } + }, 500); + } + } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index 18506403..d257ff59 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -161,6 +161,15 @@ export class WorkListMainItgComponent implements OnInit { if (actionName == "ReportGenerated") { return "../assets/imgs/mohemm-action/info.png" } + if (actionName == "Doable") { + return "../assets/imgs/mohemm-action/info.png" + } + if (actionName == "NotDoable") { + return "../assets/imgs/mohemm-action/info.png" + } + if (actionName == "DataCorrected") { + return "../assets/imgs/mohemm-action/info.png" + } } public segmentChangedClick(event: any) { @@ -459,6 +468,9 @@ export class WorkListMainItgComponent implements OnInit { if (action === 6) { return this.ts.trPK('worklist', 'grantMsg'); } + if (action === 7) { + return this.ts.trPK('worklist', 'grantMsg'); + } } @@ -471,16 +483,16 @@ export class WorkListMainItgComponent implements OnInit { this.actionService(1, this.commentText); } if (this.actionSelected == "Delegate") { - // this.actionService(4, this.commentText) - // this.common.openWorklistRollReplacement(); this.presentModal(4); } if (this.actionSelected === 'Doable') { + this.actionService(1, this.commentText); } if (this.actionSelected === 'Grant') { this.actionService(6, this.commentText, this.grantRequest); } if (this.actionSelected === 'NotDoable') { + this.actionService(2, this.commentText); } if (this.actionSelected === 'Question') { } @@ -493,6 +505,9 @@ export class WorkListMainItgComponent implements OnInit { if (this.actionSelected === 'ReportGenerated') { this.actionService(7, this.grantRequest); } + if (this.actionSelected === 'DataCorrected') { + this.actionService(7, this.grantRequest); + } } diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index edd44962..2cf92bc2 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1591,4 +1591,13 @@ ion-segment-button { } .offers-discount-card ion-card-content div{ font-size: 11px !important; - } \ No newline at end of file + } + + .searchbar-input-container.sc-ion-searchbar-ios{ + height: 48px; + background: #FFFFFF 0% 0% no-repeat padding-box; + border: 10px solid white; + border-radius: 50px; + width: 345px; + left: 3px; + } From 32f2900a908df2819887868c6875a5bafa7c3890 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 7 Jul 2021 11:41:09 +0300 Subject: [PATCH 2/2] design issue fixed --- .../announcement/announcement.component.html | 4 ++-- Mohem/src/theme/styles.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/backend-integrations/announcement/announcement.component.html b/Mohem/src/app/backend-integrations/announcement/announcement.component.html index 7ba86dd6..40b87677 100644 --- a/Mohem/src/app/backend-integrations/announcement/announcement.component.html +++ b/Mohem/src/app/backend-integrations/announcement/announcement.component.html @@ -4,11 +4,11 @@ - +
+ style="margin: 15px;"> diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 2cf92bc2..1361c890 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1601,3 +1601,7 @@ ion-segment-button { width: 345px; left: 3px; } + + .searchbar-input.sc-ion-searchbar-md { + border-radius: 25px; + }