Skip to content

Commit 561f3f8

Browse files
committed
fix pagination in program members & button of assigned project to program
1 parent 9ed176d commit 561f3f8

6 files changed

Lines changed: 8 additions & 6 deletions

File tree

projects/social_platform/src/app/office/features/detail/detail.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ export class DeatilComponent implements OnInit, OnDestroy {
157157
}
158158

159159
get isProjectAssigned() {
160-
return !!this.memberProjects.find(
161-
project => project.leader === this.profile?.id && project.partnerProgram
160+
const programId = this.info()?.id;
161+
162+
return this.memberProjects.some(
163+
project => project.leader === this.profile?.id && project.partnerProgram?.id === programId
162164
);
163165
}
164166

projects/social_platform/src/app/office/models/project.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { Vacancy } from "./vacancy.model";
2121
*/
2222

2323
export class PartnerProgramInfo {
24+
id!: number;
2425
programLinkId!: number;
2526
programId!: number;
2627
isSubmitted!: boolean;

projects/social_platform/src/app/office/program/detail/list/list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div
44
class="page"
5-
#listRoots
5+
#listRoot
66
[style.grid-template-columns]="listType === 'members' ? '10fr' : '8fr 2fr'"
77
>
88
<div class="page__outlet">

projects/social_platform/src/app/office/projects/edit/services/project-form.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class ProjectFormService {
4747
links: this.fb.array([]),
4848
link: ["", Validators.pattern(/^(https?:\/\/)/)],
4949
industryId: [undefined, [Validators.required]],
50-
description: ["", [Validators.required, Validators.maxLength(800)]],
50+
description: ["", [Validators.required, Validators.minLength(0), Validators.maxLength(800)]],
5151
presentationAddress: ["", [Validators.required]],
5252
coverImageAddress: ["", [Validators.required]],
5353
actuality: ["", [Validators.maxLength(400)]],

projects/social_platform/src/app/office/projects/edit/shared/project-main-step/project-main-step.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<fieldset class="project__description">
192192
<label for="description" class="field-label text-body-12">информация</label>
193193
<app-textarea
194-
[style.overflow-y]="description.value.length > 400 ? 'auto' : 'none'"
194+
[style.overflow-y]="(description.value && description.value.length) > 400 ? 'auto' : 'none'"
195195
size="big"
196196
id="description"
197197
[haveHint]="true"

projects/ui/src/lib/components/layout/profile-info/profile-info.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<a class="user" [routerLink]="['/office/profile', user.id]">
55
<div class="user__row">
66
<app-avatar class="user__avatar" [size]="33" [url]="user.avatar"></app-avatar>
7-
<i appIcon icon="arrow-no-body" appWidth="8" appHeight="4"></i>
87
</div>
98

109
<div class="user__row">

0 commit comments

Comments
 (0)