From 20de05a7b47faec7c8654f8cdd522061a877b515 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 1 Dec 2019 11:14:11 +0300 Subject: [PATCH] PR Part 2 --- .../view-note-modal.component.html | 23 +++++- .../view-note-modal.component.scss | 5 ++ .../worklist-main-pr.component.html | 70 ++++++++---------- .../worklist-main-pr.component.scss | 22 ++++-- .../worklist-main-pr.component.ts | 19 +++++ Mohem/src/assets/imgs/close.png | Bin 0 -> 913 bytes Mohem/src/assets/imgs/doc.png | Bin 0 -> 2836 bytes Mohem/src/assets/imgs/img.png | Bin 0 -> 3322 bytes Mohem/src/assets/imgs/nonfile.png | Bin 0 -> 2907 bytes Mohem/src/{ => assets}/imgs/noteLarge.png | Bin Mohem/src/{ => assets}/imgs/noteSmall.png | Bin Mohem/src/assets/imgs/pdf.png | Bin 0 -> 2747 bytes Mohem/src/theme/styles.scss | 26 ++++++- 13 files changed, 112 insertions(+), 53 deletions(-) create mode 100644 Mohem/src/assets/imgs/close.png create mode 100644 Mohem/src/assets/imgs/doc.png create mode 100644 Mohem/src/assets/imgs/img.png create mode 100644 Mohem/src/assets/imgs/nonfile.png rename Mohem/src/{ => assets}/imgs/noteLarge.png (100%) rename Mohem/src/{ => assets}/imgs/noteSmall.png (100%) create mode 100644 Mohem/src/assets/imgs/pdf.png diff --git a/Mohem/src/app/notification/view-note-modal/view-note-modal.component.html b/Mohem/src/app/notification/view-note-modal/view-note-modal.component.html index 0dc37eb2..468d02bf 100644 --- a/Mohem/src/app/notification/view-note-modal/view-note-modal.component.html +++ b/Mohem/src/app/notification/view-note-modal/view-note-modal.component.html @@ -1,4 +1,4 @@ - + + + + + + + + +

{{getSenderNote}}

+ +
+ + + + + + + + +

{{getTextNote}}

diff --git a/Mohem/src/app/notification/view-note-modal/view-note-modal.component.scss b/Mohem/src/app/notification/view-note-modal/view-note-modal.component.scss index 6a5e667f..0d612628 100644 --- a/Mohem/src/app/notification/view-note-modal/view-note-modal.component.scss +++ b/Mohem/src/app/notification/view-note-modal/view-note-modal.component.scss @@ -6,4 +6,9 @@ left: 5%; right: 5%; bottom: 5%; border: solid 1px red; +} + +.closeIcon{ + --background: transparent !important; + background: transparent; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 41816b7c..143f88ea 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -32,7 +32,7 @@ - + @@ -130,7 +130,7 @@
- + @@ -146,42 +146,26 @@ - + - + @@ -308,13 +292,12 @@
-
@@ -351,12 +334,17 @@
- -
+ +
+
+
+
+
+
+
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} -