From 952f706b44b04219cd4e979677877622d8400f28 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 10:57:54 +0300 Subject: [PATCH 1/9] member-section --- .../list/member-section-list.component.html | 35 ++++++---- .../list/member-section-list.component.scss | 66 +++++++++++++++++-- .../list/member-section-list.component.ts | 26 +++++++- .../images/icons/document/document_60dp.svg | 20 ++++++ ...ail_orange_24dp.svg => mail_blue_24dp.svg} | 2 +- ...ne_orange_24dp.svg => phone_blue_24dp.svg} | 2 +- 6 files changed, 128 insertions(+), 23 deletions(-) create mode 100644 src/assets/images/icons/document/document_60dp.svg rename src/assets/images/icons/{mail_orange_24dp.svg => mail_blue_24dp.svg} (90%) rename src/assets/images/icons/{phone_orange_24dp.svg => phone_blue_24dp.svg} (96%) diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html index 67f5ebb..ccbd174 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -1,32 +1,41 @@
-
+
-

+
-
+
- +
- - + +
- +
+
- +
-
- Подробнее -
+
+ + + Подробнее + +
+
+
+
+ 
{{getFields(member)|json}}
+
- + +
diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index e5d4877..90de881 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -4,7 +4,7 @@ width: 100%; max-width: 900px; .add { - padding: 16px 12px; + padding: 16px ; display: flex; justify-content: space-between; width: 100%; @@ -64,6 +64,7 @@ } .image { + cursor: pointer; // background: url("/assets/images/view-man.svg") center no-repeat; img { width: 273px; @@ -91,28 +92,46 @@ } .link{ font-size: 20px; - display: block; + display: inline-block; + &.tel::before{ + content: ''; + width: 24px; + height: 24px; + display: inline-block; + vertical-align: -3px; + margin-right: 4px; + background: url('~src/assets/images/icons/phone_blue_24dp.svg') center no-repeat; + } + &.mail::before{ + content: ''; + width: 24px; + height: 24px; + display: inline-block; + vertical-align: -5px; + margin-right: 4px; + background: url('~src/assets/images/icons/mail_blue_24dp.svg') center no-repeat; + } + + } .doc{ width: 100%; display: flex; - overflow: hidden; - text-overflow:ellipsis; .doc-icon{ flex-basis: 60px; align-items: flex-start; flex-shrink: 0; height: 60px; background: center no-repeat; - background-image: url('~src/assets/images/icons/document/document_pdf_60dp.svg'); + background-image: url('~src/assets/images/icons/document/document_60dp.svg'); background-size: contain; } .doc-link{ flex-shrink: 0; flex-grow: 0; - flex-basis: 100%; + flex-basis: 200px; white-space: nowrap; overflow: hidden; text-overflow:ellipsis; @@ -127,4 +146,37 @@ } } } -} + + .full-screen{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100vw; + height: 100vh; + object-fit: contain; + cursor: pointer; + } + .modal{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100vw; + height: 100vh; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + div{ + background-color: #fff; + width: 50vw; + min-width: 400px; + border-radius: 12px; + padding: 0 24px; + } + } + } + diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index da10129..e040d50 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -12,6 +12,9 @@ export class MemberSectionListComponent { @Input() editMode: boolean; @Input() page: any; + public showImage = false; + public showDescription = false; + constructor( private formsService: FormsService, private router: Router, @@ -56,7 +59,8 @@ export class MemberSectionListComponent { } iconUrl(name:string){ - return `url(/assets/images/icons/document/${name.toUpperCase()}.svg)` + + if (name)return ICON_TYPE[name] && `url(/assets/images/icons/document/${ICON_TYPE[name]}.svg)` } get modelType() { @@ -74,4 +78,24 @@ export class MemberSectionListComponent { getLink(id: any) { return this.router.url + '?id=' + id; } + + photo(member) { + console.log(member) + console.log(this.getFields(member)) + console.log(this.getFields(member)['member-image'].links.open) + return this.getFields(member)['member-image'].links.open + } +} + + +const ICON_TYPE:any={ + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' } diff --git a/src/assets/images/icons/document/document_60dp.svg b/src/assets/images/icons/document/document_60dp.svg new file mode 100644 index 0000000..b0e563a --- /dev/null +++ b/src/assets/images/icons/document/document_60dp.svg @@ -0,0 +1,20 @@ + + + + background + + + + Layer 1 + + + + + + + + + + FILE + + \ No newline at end of file diff --git a/src/assets/images/icons/mail_orange_24dp.svg b/src/assets/images/icons/mail_blue_24dp.svg similarity index 90% rename from src/assets/images/icons/mail_orange_24dp.svg rename to src/assets/images/icons/mail_blue_24dp.svg index c1877f6..a33d91a 100644 --- a/src/assets/images/icons/mail_orange_24dp.svg +++ b/src/assets/images/icons/mail_blue_24dp.svg @@ -1,6 +1,6 @@ - + diff --git a/src/assets/images/icons/phone_orange_24dp.svg b/src/assets/images/icons/phone_blue_24dp.svg similarity index 96% rename from src/assets/images/icons/phone_orange_24dp.svg rename to src/assets/images/icons/phone_blue_24dp.svg index 8746520..a9a3ad7 100644 --- a/src/assets/images/icons/phone_orange_24dp.svg +++ b/src/assets/images/icons/phone_blue_24dp.svg @@ -3,7 +3,7 @@ - + From e790d83f16e7ca76a8a3a9d514925dbd4164fb97 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 11:48:41 +0300 Subject: [PATCH 2/9] tree csss --- .../layout/header/user-bar/header-user-bar.component.ts | 1 + .../basic/member/list/member-section-list.component.html | 2 +- src/app/_modules/pages/tree/pages-tree.component.scss | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index 313ab6c..1f85c5a 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -41,6 +41,7 @@ export class HeaderUserBarComponent { } link(link: string) { + console.log(link) this.ddHidden = true; this.router.navigate([link]).then(); } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html index ccbd174..60014d1 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -31,7 +31,7 @@
- 
{{getFields(member)|json}}
+ diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index fe3e516..b4c4c71 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -14,6 +14,13 @@ .item .item .bar{ padding-left: 150px; } + .item .item .item .bar{ + padding-left: 200px; + } + + .item .item .item .item .bar{ + padding-left: 250px; + } } From 31197cb62015dba2a47274bdfc4e82dc2ab58651 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 12:32:56 +0300 Subject: [PATCH 3/9] css line between news items --- .../publications/list/item/news/news.component.scss | 10 +++++++--- src/app/_modules/publications/list/list.component.scss | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/_modules/publications/list/item/news/news.component.scss b/src/app/_modules/publications/list/item/news/news.component.scss index 60dd72e..3bcdf64 100644 --- a/src/app/_modules/publications/list/item/news/news.component.scss +++ b/src/app/_modules/publications/list/item/news/news.component.scss @@ -1,7 +1,11 @@ +:host-context(publications-list-item:not(:last-child)){ + .item { + border-bottom: 1px solid #C0C0C0; + } +} + .item { - border-top: 1px solid #E8E8E8; - margin-top: 24px; - padding-top: 24px; + padding: 24px 0; display: flex; flex-direction: column; diff --git a/src/app/_modules/publications/list/list.component.scss b/src/app/_modules/publications/list/list.component.scss index da2f023..31aab26 100644 --- a/src/app/_modules/publications/list/list.component.scss +++ b/src/app/_modules/publications/list/list.component.scss @@ -1,5 +1,4 @@ .items { - border-bottom: 1px solid #E8E8E8; padding-bottom: 24px; margin-bottom: 24px; .add { From d166a875d47b562414db7f483145d8ced71f0620 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 13:44:46 +0300 Subject: [PATCH 4/9] css fix --- src/app/_modules/pages/page/page.component.ts | 7 +++---- .../basic/image-group/image-group-section.component.html | 6 +++--- .../types/basic/images/images-section.component.scss | 1 + .../basic/member/list/member-section-list.component.scss | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index 3e5086a..4147cef 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -32,15 +32,15 @@ export class PageComponent { get permissions() { return this.page?.permissions; } + get isEditable() { return this.permissions?.edit || this.permissions?.anything; } + get pageTopName(){ - return this.page?.parents?.data[2]?.name; + return this.page?.parents?.data[1]?.name; } - - ngOnInit() { this.listsService.controls().subscribe(res => { this.inited ? this.fetch() : this.inited = true; @@ -51,7 +51,6 @@ export class PageComponent { this.routeSubscription?.unsubscribe(); } - onNavigationEnd(event: NavigationEnd) { let url = event.url.split('(')[0]; url = url.split('?')[0]; diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html index 5890e18..8296117 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html @@ -1,9 +1,9 @@
-
+
-

+
-
+
diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index 6231e34..2260564 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -168,6 +168,7 @@ width: auto; height: 100%; max-height: calc(100vh - 2 * 24px); + background-color: #fff; } } .right { diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index 90de881..328718f 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -157,6 +157,7 @@ height: 100vh; object-fit: contain; cursor: pointer; + } .modal{ position: fixed; From 36939af445a2eaa209aa6ca76fb42def9ba6d62d Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 15:03:44 +0300 Subject: [PATCH 5/9] mobile main menu UI --- src/app/_modules/layout/header/header.component.ts | 3 ++- .../pages/menu/item/pages-menu-item.component.html | 2 +- .../member/item/member-section-item.component.scss | 11 ----------- src/assets/css/main-menu.scss | 5 ++--- src/assets/images/icons/chevron_cirle_right_24dp.svg | 9 +++++++++ 5 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 src/assets/images/icons/chevron_cirle_right_24dp.svg diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts index f79c875..1c5ac2f 100644 --- a/src/app/_modules/layout/header/header.component.ts +++ b/src/app/_modules/layout/header/header.component.ts @@ -56,6 +56,7 @@ export class HeaderComponent { } itemSelect(event:any){ - if(!event.children?.data.length) this.showBottom = false; + // if(!event.children?.data.length) + this.showBottom = false; } } diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.html b/src/app/_modules/pages/menu/item/pages-menu-item.component.html index 9d6ea55..bf62322 100644 --- a/src/app/_modules/pages/menu/item/pages-menu-item.component.html +++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.html @@ -1,6 +1,6 @@
-{{item.name}} + + + + Layer 1 + + + + \ No newline at end of file From 8e8f2356264940e8af9fc507bc272436bf6a49e0 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 16:35:44 +0300 Subject: [PATCH 6/9] User Bar --- .../layout/header/header.component.html | 9 ++--- .../layout/header/header.component.scss | 38 ++++++++----------- .../user-bar/header-user-bar.component.html | 6 +-- .../user-bar/header-user-bar.component.scss | 7 +++- .../user-bar/header-user-bar.component.ts | 11 +++--- .../pages/tree/pages-tree.component.scss | 2 +- 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index 23eaeb6..1f5f409 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -4,18 +4,15 @@
- - - +
АИС СЦ ВНИИГАЗ
- АИС СЦ ВНИИГАЗ + + АИС СЦ ВНИИГАЗ
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss index abd3ef4..35134d1 100644 --- a/src/app/_modules/layout/header/header.component.scss +++ b/src/app/_modules/layout/header/header.component.scss @@ -1,11 +1,11 @@ @media screen and (max-width: 1264px){ .hidemobile{ - display: none; + display: none !important; } .header{ flex-grow: 1; - padding: 12px 24px; + padding: 0px 24px; background-color: #FFF; min-height: 100%; @@ -22,19 +22,14 @@ background: url('~src/assets/images/icons/burger_blue_40dp.svg') no-repeat center;; } } - .logo{ - width: 114px; + .logo { + display: inline-flex; + width:114px; height: 80px; - background: url('~src/assets/images/logo_vniigaz_1163x816.svg') no-repeat center;; + margin: 12px 24px 12px 40px; + background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg'); background-size: contain; - header-user-bar{ - position: absolute; - top:144px; - right: 24px; - *{ - display: none; - } - } + flex-shrink: 0; } .fog{ flex-grow: 1; @@ -91,7 +86,7 @@ } .right{ - display: none; + } } @@ -144,9 +139,6 @@ background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg'); background-size: contain; flex-shrink: 0; - header-user-bar{ - display: none; - } } .grid-menu{ display: flex; @@ -183,9 +175,11 @@ } } } - header-user-bar{ - position: absolute; - right: 0; - bottom: -96px; - } + +} + +header-user-bar{ + position: absolute; + right: 0; + bottom: -96px; } diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index 1be297f..0ace074 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -1,10 +1,10 @@ -
+
{{user.initials}}
-
-
    +
    +
    • Личный кабинет
    • Структура сайта
      • diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss index 4812d19..2fb9adb 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss @@ -1,4 +1,7 @@ .user { + .ddHidden{ + display: none; + } position: relative; display: flex; padding: 11px; @@ -47,7 +50,7 @@ display: none; } - &:hover { + .dropdown { display: block; width: 250px; @@ -92,7 +95,7 @@ } - } + } @media screen and (max-width: 1264px) { .user { diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index 1f85c5a..30aad37 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -10,7 +10,7 @@ import {Router} from "@angular/router"; export class HeaderUserBarComponent { @Input() user: any; public menuItems = []; - public ddHidden = false; + public ddHidden = true; constructor(public authService: AuthenticationService, private router: Router) { } @@ -28,10 +28,12 @@ export class HeaderUserBarComponent { close() { - this.ddHidden = true; - setTimeout(() => {this.ddHidden = false}, 10); + setTimeout(() => { + this.ddHidden = true; + }, 10); } + logout() { if (confirm('Вы деествительно хотите выйти из системы?')) { this.authService.logout(); @@ -41,8 +43,7 @@ export class HeaderUserBarComponent { } link(link: string) { - console.log(link) - this.ddHidden = true; + this.close() this.router.navigate([link]).then(); } } diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index b4c4c71..044ae78 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -146,7 +146,7 @@ } -@media screen and (max-width: 767px) { +@media screen and (max-width: 1264px) { .item { .bar { .mid { From b8ccc534ac986a057721308a3dad4832a4939219 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Mon, 11 Sep 2023 17:54:32 +0300 Subject: [PATCH 7/9] bugfix --- .../types/basic/images/images-section.component.scss | 6 ++++-- .../basic/member/list/member-section-list.component.html | 6 +++--- .../basic/member/list/member-section-list.component.scss | 3 +++ .../basic/member/list/member-section-list.component.ts | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index 2260564..16c2636 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -18,7 +18,7 @@ } } .large img{ - max-width: 100%; + border-radius: 12px; border: 1px solid rgba(45, 45, 45, 0.27); } @@ -46,11 +46,13 @@ &.large{ display: flex; flex-direction: column; + .item{ + max-width: 100%; margin-bottom: 32px; img{ max-height: 468px; - max-width: 900px; + max-width: 100%; } } } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html index 60014d1..2e49163 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -8,9 +8,9 @@
      -
      +
      - +
      @@ -32,7 +32,7 @@
      - +
    diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index 328718f..cf7db25 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -179,5 +179,8 @@ padding: 0 24px; } } + .hidden{ + display: none; + } } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index e040d50..b0fae3a 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -12,7 +12,7 @@ export class MemberSectionListComponent { @Input() editMode: boolean; @Input() page: any; - public showImage = false; + public showImage:boolean[] = []; public showDescription = false; constructor( From ec51a7a3aa01b59bf915d8fd18cd9d3cd24f9a42 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Tue, 12 Sep 2023 10:04:53 +0300 Subject: [PATCH 8/9] document icons --- .../form-field-document.component.scss | 5 +++-- .../field-document-single.component.html | 4 +++- .../single/field-document-single.component.ts | 17 +++++++++++++++ .../document/document-section.component.scss | 2 +- .../document/document-section.component.ts | 21 +++++++++++++++++-- .../item/member-section-item.component.scss | 2 +- .../list/member-section-list.component.ts | 2 ++ 7 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/app/_modules/form-fields/types/document/form-field-document.component.scss b/src/app/_modules/form-fields/types/document/form-field-document.component.scss index 48eab06..f7b512e 100644 --- a/src/app/_modules/form-fields/types/document/form-field-document.component.scss +++ b/src/app/_modules/form-fields/types/document/form-field-document.component.scss @@ -55,8 +55,9 @@ .values { .item { - background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat; - min-height: 60px; + background: transparent url('~src/assets/images/icons/document/document_60dp.svg') 0 0 no-repeat; + background-size: contain; + height: 60px; padding-left: 72px; font-size: 20px; display: flex; diff --git a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html index 6e082f1..e06ec39 100644 --- a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html +++ b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html @@ -10,8 +10,10 @@
-
+
{{asset.name}}
+
{{asset.extension}}
+
{{extension}}
\ No newline at end of file diff --git a/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts b/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts index b9b48bd..13b3460 100644 --- a/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts +++ b/src/app/_modules/form-fields/types/document/single/field-document-single.component.ts @@ -52,6 +52,9 @@ export class FieldDocumentSingleComponent { this.asset = asset; this.control?.setValue(asset?.id); } + get extension(){ + return `url(/assets/images/icons/document/${ICON_TYPE[this.asset.extension]}.svg)` + } @@ -87,3 +90,17 @@ export class FieldDocumentSingleComponent { }); } } + +const ICON_TYPE:any={ + rtf:'DOC', + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + xlsx:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' +} diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss index 4e0f3eb..c948ad0 100644 --- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss @@ -7,7 +7,7 @@ align-items: flex-start; height: 60px; background: center no-repeat; - background-image: url('~src/assets/images/icons/document/document_pdf_60dp.svg'); + background-image: url('~src/assets/images/icons/document/document_60dp.svg'); background-size: contain; } a{ diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts b/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts index 46db145..5a5dfcf 100644 --- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts +++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.ts @@ -29,12 +29,29 @@ export class DocumentSectionComponent { } get docIcon(){ - const ext = this.section.groups.data[0].fields.data[0].value.data[0].extension.toUpperCase(); + const ext = ICON_TYPE[ + this.section.groups.data[0].fields.data[0].value.data[0].extension + ] return `url('/assets/images/icons/document/${ext}.svg')` - // return `url('/assets/images/icons/document/document_pdf_60dp.svg')` + } get download(){ return this.section.groups.data[0].fields.data[0].value.data[0].links.download; } } + +const ICON_TYPE:any={ + rtf:'DOC', + docx:'DOC', + doc:'DOC', + xl:'XLS', + xls:'XLS', + xlsx:'XLS', + ppt:'PPT', + pptx:'PPT', + jpg:'JPG', + jpeg:'JPG', + pdf:'PDF' +} + diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss index 756d6bf..26f7ffc 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss @@ -19,7 +19,7 @@ } .doc{ display: block; - background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat; + background: url('~src/assets/images/icons/document/document_60dp.svg') top left no-repeat; padding-left: 62px; min-height: 60px; } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index b0fae3a..4868ee7 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -89,10 +89,12 @@ export class MemberSectionListComponent { const ICON_TYPE:any={ + rtf:'DOC', docx:'DOC', doc:'DOC', xl:'XLS', xls:'XLS', + xlsx:'XLS', ppt:'PPT', pptx:'PPT', jpg:'JPG', From ef5db83ef2d3405d2feaef81fb5a73995de9bd90 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Tue, 12 Sep 2023 10:05:09 +0300 Subject: [PATCH 9/9] document icons --- .../document/single/field-document-single.component.html | 4 +--- .../types/basic/member/list/member-section-list.component.ts | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html index e06ec39..5e67bf0 100644 --- a/src/app/_modules/form-fields/types/document/single/field-document-single.component.html +++ b/src/app/_modules/form-fields/types/document/single/field-document-single.component.html @@ -14,6 +14,4 @@ {{asset.name}}
-
-
{{asset.extension}}
-
{{extension}}
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index 4868ee7..0551487 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -80,9 +80,6 @@ export class MemberSectionListComponent { } photo(member) { - console.log(member) - console.log(this.getFields(member)) - console.log(this.getFields(member)['member-image'].links.open) return this.getFields(member)['member-image'].links.open } }