Skip to content

Commit 434f093

Browse files
shawonshawon
shawon
authored and
shawon
committed
added new folder selection design
1 parent 86841c9 commit 434f093

File tree

7 files changed

+86
-64
lines changed

7 files changed

+86
-64
lines changed

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
1111
{{ 'Status' | translate }}
1212
</mat-slide-toggle>
1313
<mat-slide-toggle *ngIf="selectCurrentUserIsAdmin$ | async"
14-
class="p-2"
15-
color="primary"
16-
id="complianceEnabledToggle"
17-
formControlName="complianceEnabled"
18-
(change)="changeComplianceEnabled($event.checked)"
14+
class="p-2"
15+
color="primary"
16+
id="complianceEnabledToggle"
17+
formControlName="complianceEnabled"
18+
(change)="changeComplianceEnabled($event.checked)"
1919
>
2020
{{ 'Compliance' | translate }}
2121
</mat-slide-toggle>
@@ -46,10 +46,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
4646
[multiple]="false"
4747
/>
4848
</mat-form-field>
49-
<div class="pt-6">
49+
<div class="mt-3">
5050
<button
51-
matSuffix
52-
mat-icon-button
51+
class="btn-secondary btn-secondary--icon-rounded-border"
5352
color="primary"
5453
id="planningManageTagsBtn1"
5554
(click)="openTagsModal()"
@@ -60,22 +59,29 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
6059
</div>
6160
</div>
6261

63-
<div class="d-flex flex-row">
64-
<div style="width: 450px" class="p-2">
65-
<button
66-
mat-icon-button
67-
color="accent"
68-
id="createFolder"
69-
(click)="openFoldersModal()"
70-
style="margin-left: -10px"
71-
[disabled]="!taskForm.value.propertyId"
72-
[matTooltip]="(!taskForm.value.propertyId ? 'Need to select property' : 'Select folder') | translate"
73-
>
74-
<mat-icon>folder</mat-icon>
75-
</button>
76-
<span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
77-
</div>
78-
</div>
62+
<!-- <div class="d-flex flex-row">-->
63+
<!-- <div style="width: 450px" class="p-2">-->
64+
<!-- <button-->
65+
<!-- mat-icon-button-->
66+
<!-- color="accent"-->
67+
<!-- id="createFolder"-->
68+
<!-- (click)="openFoldersModal()"-->
69+
<!-- style="margin-left: -10px"-->
70+
<!-- [disabled]="!taskForm.value.propertyId"-->
71+
<!-- [matTooltip]="(!taskForm.value.propertyId ? 'Need to select property' : 'Select folder') | translate"-->
72+
<!-- >-->
73+
<!-- <mat-icon>folder</mat-icon>-->
74+
<!-- </button>-->
75+
<!-- <span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>-->
76+
<!-- </div>-->
77+
<!-- </div>-->
78+
79+
<app-folder-tree-select
80+
[nodes]="foldersTreeDto"
81+
[selectedNodeId]="taskForm.get('folderId')?.value"
82+
(nodeSelected)="onFolderSelected($event)"
83+
[disabled]="!taskForm.value.propertyId"
84+
></app-folder-tree-select>
7985

8086
<div class="d-flex flex-row">
8187
<mat-form-field class="p-2">
@@ -108,11 +114,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
108114
[multiple]="true"
109115
/>
110116
</mat-form-field>
111-
<div class="pt-6">
117+
<div class="mt-3">
112118
<button
113-
matSuffix
114-
mat-icon-button
115-
color="primary"
119+
class="btn-secondary btn-secondary--icon-rounded-border"
116120
id="planningManageTagsBtn2"
117121
(click)="openTagsModal()"
118122
matTooltip="{{ 'Manage tags' | translate }}"

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
6868
dayOfWeekArr: { id: number, name: string }[] = [];
6969
taskForm: FormGroup;
7070
selectedFolderName: string = '';
71+
selectedFolderId: number = null;
7172
appLanguages: LanguagesModel = new LanguagesModel();
7273
templateRequestModel: TemplateRequestModel = new TemplateRequestModel();
7374
templatesModel: TemplateListModel = new TemplateListModel();
@@ -100,7 +101,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
100101
return TaskWizardStatusesEnum;
101102
}
102103

103-
104+
104105
constructor() {
105106
this.typeahead
106107
.pipe(
@@ -266,6 +267,12 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
266267
});
267268
}
268269

270+
onFolderSelected(folder: FolderDto) {
271+
this.taskForm.patchValue({ folderId: folder.id });
272+
this.selectedFolderId = folder.id;
273+
this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
274+
}
275+
269276
/*updateLanguageModel(translationsModel: CommonTranslationsModel, index: number) {
270277
this.model.translates[index] = translationsModel;
271278
}*/

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,27 +60,37 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
6060
</div>
6161
</div>
6262
<div class="d-flex flex-row">
63-
<div style="width: 450px" class="p-2">
64-
<button
65-
mat-icon-button
66-
color="accent"
67-
id="updateFolder"
68-
(click)="openFoldersModal()"
69-
style="margin-left: -10px"
70-
[disabled]="
63+
<!-- <div style="width: 450px" class="p-2">-->
64+
<!-- <button-->
65+
<!-- mat-icon-button-->
66+
<!-- color="accent"-->
67+
<!-- id="updateFolder"-->
68+
<!-- (click)="openFoldersModal()"-->
69+
<!-- style="margin-left: -10px"-->
70+
<!-- [disabled]="-->
71+
<!-- !taskForm.get('propertyId')?.value ||-->
72+
<!-- taskForm.get('status')?.value === TaskWizardStatusesEnum.Active-->
73+
<!-- "-->
74+
<!-- [matTooltip]="-->
75+
<!-- (!taskForm.get('propertyId')?.value-->
76+
<!-- ? 'Need to select property'-->
77+
<!-- : 'Select folder') | translate-->
78+
<!-- "-->
79+
<!-- >-->
80+
<!-- <mat-icon>folder</mat-icon>-->
81+
<!-- </button>-->
82+
<!-- <span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>-->
83+
<!-- </div>-->
84+
85+
<app-folder-tree-select
86+
[nodes]="foldersTreeDto"
87+
[selectedNodeId]="taskForm.get('folderId')?.value"
88+
(nodeSelected)="onFolderSelected($event)"
89+
[disabled]="
7190
!taskForm.get('propertyId')?.value ||
7291
taskForm.get('status')?.value === TaskWizardStatusesEnum.Active
7392
"
74-
[matTooltip]="
75-
(!taskForm.get('propertyId')?.value
76-
? 'Need to select property'
77-
: 'Select folder') | translate
78-
"
79-
>
80-
<mat-icon>folder</mat-icon>
81-
</button>
82-
<span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
83-
</div>
93+
></app-folder-tree-select>
8494
</div>
8595

8696
<div class="d-flex flex-row">

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
6262
statuses: { label: string, value: number }[] = [];
6363
foldersTreeDto: FolderDto[] = [];
6464
selectedFolderName: string = '';
65+
selectedFolderId: number;
6566
repeatTypeDay: { name: string, id: number }[] = [];
6667
repeatTypeWeek: { name: string, id: number }[] = [];
6768
repeatTypeMonth: { name: string, id: number }[] = [];
@@ -102,7 +103,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
102103
return R.equals(this.taskForm.value, this.copyModel);
103104
}
104105

105-
106+
106107
constructor() {
107108
this.typeahead
108109
.pipe(
@@ -316,6 +317,12 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
316317
}
317318
}
318319

320+
onFolderSelected(folder: FolderDto) {
321+
this.taskForm.patchValue({ folderId: folder.id });
322+
this.selectedFolderId = folder.id;
323+
this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
324+
}
325+
319326
update() {
320327

321328
const task: TaskWizardCreateModel = {

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="d-flex flex-column" [formGroup]="filtersForm">
2-
<div class="d-flex need-wrapper">
1+
<div class="d-flex flex-row align-items-center gap-12 px-3" [formGroup]="filtersForm">
2+
<!-- <div class="d-flex need-wrapper">-->
33
<mat-form-field>
44
<mat-label>{{'Location' | translate}}</mat-label>
55
<mtx-select
@@ -22,8 +22,8 @@
2222
[bindLabel]="'name'"
2323
/>
2424
</mat-form-field>
25-
</div>
26-
<div class="d-flex need-wrapper">
25+
<!-- </div>-->
26+
<!-- <div class="d-flex need-wrapper">-->
2727
<mat-form-field>
2828
<mat-label>{{'Tags' | translate}}</mat-label>
2929
<mtx-select
@@ -58,4 +58,4 @@
5858
/>
5959
</mat-form-field>
6060
</div>
61-
</div>
61+
<!--</div>-->

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
<eform-new-subheader>
2-
<!-- <button-->
3-
<!-- mat-icon-button-->
4-
<!-- color="primary"-->
5-
<!-- id="planningManageTagsBtn"-->
6-
<!-- (click)="openTagsModal()"-->
7-
<!-- matTooltip="{{ 'Manage tags' | translate }}"-->
8-
<!-- *ngIf="authStateService.isAdmin"-->
9-
<!-- >-->
10-
<!-- <mat-icon>discount</mat-icon>-->
11-
<!-- </button>-->
122
<button
133
class="btn-primary btn-primary--icon-left"
144
[matTooltip]="'Create new task' | translate"
@@ -37,7 +27,7 @@
3727
/>
3828
<button
3929
*ngIf="selectAuthIsAdmin$ | async;"
40-
class="btn-warning mb-4"
30+
class="btn-warning mb-4 ml-3"
4131
[disabled]="
4232
!selectedPlanningsCheckboxes || selectedPlanningsCheckboxes.length === 0
4333
"

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ import {MatCardModule} from '@angular/material/card';
2929
import {PlanningsModule} from '../../../items-planning-pn/modules/plannings/plannings.module';
3030
import {StatisticsModule} from '../statistics/statistics.module';
3131
import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
32+
import {
33+
FolderTreeSelectComponent
34+
} from "src/app/common/modules/eform-shared/components/eform-tree-select/folder-tree-select.component";
3235

3336
@NgModule({
3437
imports: [
@@ -57,6 +60,7 @@ import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
5760
MatMenu,
5861
MatMenuItem,
5962
MatMenuTrigger,
63+
FolderTreeSelectComponent,
6064
],
6165
declarations: [
6266
TaskWizardFiltersComponent,

0 commit comments

Comments
 (0)