From ff68fb5c0290a8a48540908d0eac9e8efb328d5b Mon Sep 17 00:00:00 2001 From: megli2 Date: Mon, 4 Dec 2023 13:28:32 +0100 Subject: [PATCH 1/7] implement placeholder icons and add line-through decoration if actions are completed --- .../app/keyresult-detail/keyresult-detail.component.html | 8 ++++---- frontend/src/assets/icons/bookmark-check.svg | 4 ++++ frontend/src/assets/icons/bookmark.svg | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 frontend/src/assets/icons/bookmark-check.svg create mode 100644 frontend/src/assets/icons/bookmark.svg diff --git a/frontend/src/app/keyresult-detail/keyresult-detail.component.html b/frontend/src/app/keyresult-detail/keyresult-detail.component.html index 26ee09c3b1..ef7a7be37a 100644 --- a/frontend/src/app/keyresult-detail/keyresult-detail.component.html +++ b/frontend/src/app/keyresult-detail/keyresult-detail.component.html @@ -114,13 +114,13 @@

Action Plan

checkbox - {{ action.action }} + {{ + action.action + }}
diff --git a/frontend/src/assets/icons/bookmark-check.svg b/frontend/src/assets/icons/bookmark-check.svg new file mode 100644 index 0000000000..dcbe089851 --- /dev/null +++ b/frontend/src/assets/icons/bookmark-check.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/src/assets/icons/bookmark.svg b/frontend/src/assets/icons/bookmark.svg new file mode 100644 index 0000000000..a21b14b0c8 --- /dev/null +++ b/frontend/src/assets/icons/bookmark.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file From df17f6d36d026883efdd42430b40c932915e6117 Mon Sep 17 00:00:00 2001 From: megli2 Date: Mon, 4 Dec 2023 13:33:38 +0100 Subject: [PATCH 2/7] display - instead of empty string if description of objective is empty --- .../src/app/objective-detail/objective-detail.component.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/objective-detail/objective-detail.component.html b/frontend/src/app/objective-detail/objective-detail.component.html index 650ee0fe39..eb47906b95 100644 --- a/frontend/src/app/objective-detail/objective-detail.component.html +++ b/frontend/src/app/objective-detail/objective-detail.component.html @@ -15,7 +15,10 @@

Beschrieb

-

{{ objective.description }}

+

-

+

+ {{ objective.description }} +

Date: Mon, 4 Dec 2023 13:44:56 +0100 Subject: [PATCH 3/7] add line through text-decoration if checkbox is clicked in check-in form --- .../checkin/check-in-form/check-in-form.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/shared/dialog/checkin/check-in-form/check-in-form.component.html b/frontend/src/app/shared/dialog/checkin/check-in-form/check-in-form.component.html index 56989a063c..b3665513b8 100644 --- a/frontend/src/app/shared/dialog/checkin/check-in-form/check-in-form.component.html +++ b/frontend/src/app/shared/dialog/checkin/check-in-form/check-in-form.component.html @@ -13,8 +13,11 @@
- - + + {{ action.action }} From 8eb1603522349bf01780c876513b59d6624e54b2 Mon Sep 17 00:00:00 2001 From: Lias Kleisa Date: Thu, 7 Dec 2023 11:12:45 +0100 Subject: [PATCH 4/7] Remove unused icons --- frontend/src/assets/icons/bookmark-check.svg | 4 ---- frontend/src/assets/icons/bookmark.svg | 3 --- frontend/src/assets/icons/checked_checkbox.svg | 1 - frontend/src/assets/icons/close.svg | 4 ---- frontend/src/assets/icons/close_icon.svg | 6 ------ frontend/src/assets/icons/empty_checkbox.svg | 3 --- frontend/src/assets/icons/objective-indicator.svg | 15 --------------- frontend/src/assets/images/progress_bar.svg | 5 ----- 8 files changed, 41 deletions(-) delete mode 100644 frontend/src/assets/icons/bookmark-check.svg delete mode 100644 frontend/src/assets/icons/bookmark.svg delete mode 100644 frontend/src/assets/icons/checked_checkbox.svg delete mode 100644 frontend/src/assets/icons/close.svg delete mode 100644 frontend/src/assets/icons/close_icon.svg delete mode 100644 frontend/src/assets/icons/empty_checkbox.svg delete mode 100644 frontend/src/assets/icons/objective-indicator.svg delete mode 100644 frontend/src/assets/images/progress_bar.svg diff --git a/frontend/src/assets/icons/bookmark-check.svg b/frontend/src/assets/icons/bookmark-check.svg deleted file mode 100644 index dcbe089851..0000000000 --- a/frontend/src/assets/icons/bookmark-check.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/assets/icons/bookmark.svg b/frontend/src/assets/icons/bookmark.svg deleted file mode 100644 index a21b14b0c8..0000000000 --- a/frontend/src/assets/icons/bookmark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/assets/icons/checked_checkbox.svg b/frontend/src/assets/icons/checked_checkbox.svg deleted file mode 100644 index 4487ca4874..0000000000 --- a/frontend/src/assets/icons/checked_checkbox.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/assets/icons/close.svg b/frontend/src/assets/icons/close.svg deleted file mode 100644 index f1c1ff8dc9..0000000000 --- a/frontend/src/assets/icons/close.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/src/assets/icons/close_icon.svg b/frontend/src/assets/icons/close_icon.svg deleted file mode 100644 index 8b46070da6..0000000000 --- a/frontend/src/assets/icons/close_icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/frontend/src/assets/icons/empty_checkbox.svg b/frontend/src/assets/icons/empty_checkbox.svg deleted file mode 100644 index e320700981..0000000000 --- a/frontend/src/assets/icons/empty_checkbox.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/src/assets/icons/objective-indicator.svg b/frontend/src/assets/icons/objective-indicator.svg deleted file mode 100644 index bc7452a1ba..0000000000 --- a/frontend/src/assets/icons/objective-indicator.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - O - diff --git a/frontend/src/assets/images/progress_bar.svg b/frontend/src/assets/images/progress_bar.svg deleted file mode 100644 index 8413a86332..0000000000 --- a/frontend/src/assets/images/progress_bar.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 9ecc3204b8172918cf8e1057115ff50716b2c3c9 Mon Sep 17 00:00:00 2001 From: Lias Kleisa Date: Thu, 7 Dec 2023 11:13:29 +0100 Subject: [PATCH 5/7] Add new checkmark icon --- .../keyresult-detail/keyresult-detail.component.html | 11 ++++++----- .../objective-detail/objective-detail.component.html | 8 ++++---- frontend/src/assets/icons/checkmark.svg | 10 ++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 frontend/src/assets/icons/checkmark.svg diff --git a/frontend/src/app/keyresult-detail/keyresult-detail.component.html b/frontend/src/app/keyresult-detail/keyresult-detail.component.html index ef7a7be37a..4a8b7361dc 100644 --- a/frontend/src/app/keyresult-detail/keyresult-detail.component.html +++ b/frontend/src/app/keyresult-detail/keyresult-detail.component.html @@ -114,20 +114,21 @@

Action Plan

checkbox - {{ - action.action - }} + + - + {{ action.action }}