Boards board #41
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,58 @@ | ||
| <div class="flex flex-col gap-[16px]"> | ||
| <h1 class="text-3xl">{{ modelService.sprintName }}</h1> | ||
|
|
||
| <div class="flex items-center gap-4"> | ||
| <mat-form-field subscriptSizing="dynamic"> | ||
| <mat-label>Search</mat-label> | ||
| <input #filterField matInput type="text" (input)="updateFilterString(filterField.value)" /> | ||
| </mat-form-field> | ||
|
|
||
| <div class="flex flex-col gap-[1px]"> | ||
| <span class="text-xs">Group by</span> | ||
| <button mat-raised-button [matMenuTriggerFor]="groupingMenu" color="primary"> | ||
| <mat-icon>expand_more</mat-icon> | ||
| {{ taskGrouping }} | ||
| </button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="flex flex-col gap-[8px]"> | ||
| <columnset> | ||
| <h2 todo class="font-bold m-auto p-1">TODO ({{ modelService.todoSize() }}/{{ modelService.allTasksSize() }})</h2> | ||
| <h2 inprogress class="font-bold m-auto p-1">INPROGRESS ({{ modelService.inprogressSize() }}/{{ modelService.allTasksSize() }})</h2> | ||
| <h2 done class="font-bold m-auto p-1">DONE ({{ modelService.doneSize() }}/{{ modelService.allTasksSize() }})</h2> | ||
| </columnset> | ||
|
|
||
| @for (slice of slicesModelService.slices; track slice) { | ||
| <div> | ||
| @if (taskGrouping == TaskGroupingEnum.NONE) { | ||
| <slice [sliceDescriptor]="slice"></slice> | ||
| } @else if(taskGrouping == TaskGroupingEnum.BY_ASSIGNEE) { | ||
| <button mat-button (click)="toggleHidden(sliceWrapper)"> | ||
| <mat-icon> | ||
| {{ isHidden(sliceWrapper) ? "chevron_right" : "expand_more" }} | ||
| </mat-icon> | ||
| <div class="flex items-center space-x-1"> | ||
| <img class="w-5 h-5 rounded-full" src="{{ slice.metadata.avatarUrl }}" /> | ||
| <span> | ||
| {{ slice.metadata.firstName + " " + slice.metadata.familyName }} | ||
| </span> | ||
| </div> | ||
| </button> | ||
|
|
||
| <div #sliceWrapper> | ||
| <slice [sliceDescriptor]="slice"></slice> | ||
| </div> | ||
| } | ||
| </div> | ||
| } | ||
| </div> | ||
| </div> | ||
|
|
||
| <mat-menu #groupingMenu="matMenu"> | ||
| @for (taskGrouping of TASK_GROUPINGS; track taskGrouping) { | ||
|
|
||
| <button mat-menu-item (click)="updateTaskGrouping(taskGrouping)"> | ||
| {{ taskGrouping }} | ||
| </button> | ||
| } | ||
| </mat-menu> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,120 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { MatInputModule } from '@angular/material/input'; | ||
| import { MatButtonModule } from '@angular/material/button'; | ||
| import { MatMenuModule } from '@angular/material/menu'; | ||
| import { SlicesModelService, TaskChangedColumnEvent, TaskChangedGroupEvent } from './slice/slices_model.service'; | ||
| import { SliceService } from './slice/slice.service'; | ||
| import { SliceComponent } from './slice/slice.component'; | ||
| import { Assignee, SAMPLE_ASSIGNEES, SAMPLE_TASKS, Task } from './model/model'; | ||
| import { ModelService } from './model/model.service'; | ||
| import { ColumnSetLayout } from './layout.component'; | ||
| import { MatIconModule } from '@angular/material/icon'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-board', | ||
| standalone: true, | ||
| imports: [ | ||
| CommonModule, | ||
| MatInputModule, | ||
| MatMenuModule, | ||
| MatButtonModule, | ||
| SliceComponent, | ||
| MatIconModule, | ||
| ColumnSetLayout, | ||
| ], | ||
| providers: [ | ||
| ModelService, | ||
| SlicesModelService, | ||
| SliceService, | ||
| ], | ||
| templateUrl: './board.component.html', | ||
| }) | ||
| export class BoardComponent implements OnInit { | ||
|
There was a problem hiding this comment. Poprawić return type w całej klasie |
||
|
|
||
| protected filterString = ""; | ||
|
|
||
| protected taskGrouping = TaskGrouping.BY_ASSIGNEE; | ||
|
|
||
|
|
||
| constructor( | ||
| protected readonly modelService: ModelService, | ||
|
There was a problem hiding this comment. jeżeli service jest używany tylko w tej klasie to powinien być |
||
| protected readonly slicesModelService: SlicesModelService, | ||
| ) { } | ||
|
|
||
| ngOnInit() { | ||
| this.modelService.modelChangeHandler = () => { | ||
| this.slicesModelService.rebuildSlices(); | ||
| } | ||
| this.modelService.assignees = Object.values(SAMPLE_ASSIGNEES); | ||
| this.modelService.todo = SAMPLE_TASKS.TODO; | ||
| this.modelService.inprogress = SAMPLE_TASKS.INPROGRESS; | ||
| this.modelService.done = SAMPLE_TASKS.DONE; | ||
| this.slicesModelService.groupChangedHandler = (event: TaskChangedGroupEvent) => { | ||
| if (this.taskGrouping == TaskGrouping.BY_ASSIGNEE && | ||
| event.sourceGroupMetadata != event.destinationGroupMetadata | ||
| ) { | ||
| this.modelService.setAssigneeForTask(event.task, event.destinationGroupMetadata); | ||
| } | ||
| } | ||
| this.slicesModelService.columnChangedHandler = (event: TaskChangedColumnEvent) => { | ||
| this.modelService.moveTaskToArray(event.task, | ||
| event.sourceColumn, event.sourceColumnIndex, | ||
| event.destinationColumn, event.destinationColumnIndex | ||
| ); | ||
| } | ||
| this.updateFilterString(this.filterString); | ||
| this.updateTaskGrouping(this.taskGrouping); | ||
| } | ||
|
|
||
| protected updateFilterString(filterString: string) { | ||
|
|
||
| filterString = filterString.toLowerCase(); | ||
| this.filterString = filterString; | ||
| const stringPredicate = (s: string) => s.toLowerCase().includes(filterString); | ||
| this.slicesModelService.filter = (t: Task) => { | ||
| return stringPredicate(t.content) | ||
| || stringPredicate(t.assignee.firstName) | ||
| || stringPredicate(t.assignee.firstName + " " + t.assignee.familyName) | ||
| || stringPredicate(t.assignee.familyName) | ||
| || stringPredicate(t.taskid); | ||
| }; | ||
| this.slicesModelService.rebuildSlices(); | ||
| } | ||
|
|
||
| protected updateTaskGrouping(taskGrouping: TaskGrouping) { | ||
| this.taskGrouping = taskGrouping; | ||
| this.slicesModelService.grouper = this.GROUPERS[taskGrouping]; | ||
| this.slicesModelService.rebuildSlices(); | ||
| } | ||
|
|
||
| protected toggleHidden(element: any) { | ||
|
|
||
| element.hidden = !element.hidden; | ||
| } | ||
|
|
||
| protected isHidden(element: any) { | ||
| return element.hidden; | ||
| } | ||
|
|
||
| protected readonly TaskGroupingEnum = TaskGrouping; | ||
| protected readonly TASK_GROUPINGS = Object.values(TaskGrouping); | ||
| protected readonly GROUPERS = { | ||
| [TaskGrouping.NONE]: (ungrouped: Task[]) => { | ||
| return [{ metadata: null, group: ungrouped }] | ||
| }, | ||
| [TaskGrouping.BY_ASSIGNEE]: (ungrouped: Task[]) => { | ||
| return this.modelService.assignees.map((a: Assignee) => { | ||
| return { | ||
| metadata: a, | ||
| group: ungrouped.filter((t: Task) => { | ||
| return t.assignee.firstName == a.firstName | ||
| && t.assignee.familyName == a.familyName | ||
| }) | ||
| }; | ||
| }); | ||
| }, | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| enum TaskGrouping { | ||
|
There was a problem hiding this comment. czemu ten |
||
| NONE = "None", | ||
| BY_ASSIGNEE = "By assignee", | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <div [matMenuTriggerFor]="instance" (click)="update()"> | ||
| <ng-content></ng-content> | ||
| </div> | ||
|
|
||
| <mat-menu #instance> | ||
| <mat-form-field (click)="$event.stopPropagation()" subscriptSizing="dynamic"> | ||
| <mat-label>Search members</mat-label> | ||
| <input matInput #filterStringInput type="text" (click)="$event.stopPropagation()" (input)="update()" /> | ||
| </mat-form-field> | ||
|
|
||
| <mat-divider></mat-divider> | ||
|
|
||
| @for(item of filteredAssignees; track item) { | ||
| <button mat-menu-item (click)="assigneeChanged(item)"> | ||
| <div class="flex items-center space-x-3"> | ||
| <ng-container *ngTemplateOutlet="zerowidthspace"></ng-container> | ||
| <img class="w-6 h-6 rounded-full" src="{{ item.avatarUrl }}" title="{{ item.firstName + ' ' + item.familyName }}" /> | ||
|
|
||
| <span> | ||
| {{ item.firstName + " " + item.familyName }} | ||
| </span> | ||
| </div> | ||
| </button> | ||
| } | ||
| </mat-menu> | ||
|
|
||
| <ng-template #zerowidthspace></ng-template> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import { Input } from '@angular/core'; | ||
| import { Assignee, Task } from '../model/model'; | ||
| import { MatMenuModule } from '@angular/material/menu'; | ||
| import { Component, ViewChild } from '@angular/core'; | ||
| import { FormControl } from '@angular/forms'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { MatInputModule } from '@angular/material/input'; | ||
| import { MatButtonModule } from '@angular/material/button'; | ||
| import { MatDividerModule } from '@angular/material/divider'; | ||
| import { ModelService } from '../model/model.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'change-assignee-menu', | ||
| standalone: true, | ||
| imports: [ | ||
| CommonModule, | ||
| MatMenuModule, | ||
| MatInputModule, | ||
| MatButtonModule, | ||
| MatDividerModule, | ||
| ], | ||
| templateUrl: './change_assignee_menu.component.html', | ||
| }) | ||
| export class ChangeAssigneeMenuComponent { | ||
|
|
||
|
|
||
| protected myControl = new FormControl(''); | ||
|
|
||
| protected filteredAssignees: Assignee[] = []; | ||
|
|
||
| @Input() associatedTask?: Task; | ||
|
|
||
| @ViewChild('filterStringInput') private input?: any; | ||
|
|
||
|
|
||
| constructor( | ||
| protected readonly modelService: ModelService, | ||
|
|
||
| ) { } | ||
|
|
||
| protected update() { | ||
| if (!this.input) | ||
| return; | ||
| const filterString = this.input.nativeElement.value.toLowerCase(); | ||
| this.filteredAssignees = this.modelService.assignees.filter(a => | ||
| a.firstName.toLowerCase().includes(filterString) || | ||
| a.familyName.toLowerCase().includes(filterString) || | ||
| (a.firstName + " " + a.familyName).toLowerCase().includes(filterString) | ||
| ) | ||
| } | ||
|
|
||
| protected assigneeChanged(assignee: Assignee) { | ||
| if (!this.associatedTask) | ||
| return; | ||
| this.modelService.setAssigneeForTask(this.associatedTask, assignee); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
brak
altattribute