Skip to content

new folder desing #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renemadsen merged 2 commits into from
Dec 8, 2025
Merged

new folder desing #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86841c9
Merge pull request #14 from microting/master
masudul-tikweb Dec 1, 2025
04ff3b2
added new folder selection design
Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions ...ents/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
{{ 'Status' | translate }}
</mat-slide-toggle>
<mat-slide-toggle *ngIf="selectCurrentUserIsAdmin$ | async"
class="p-2"
color="primary"
id="complianceEnabledToggle"
formControlName="complianceEnabled"
(change)="changeComplianceEnabled($event.checked)"
class="p-2"
color="primary"
id="complianceEnabledToggle"
formControlName="complianceEnabled"
(change)="changeComplianceEnabled($event.checked)"
>
{{ 'Compliance' | translate }}
</mat-slide-toggle>
Expand Down Expand Up @@ -46,10 +46,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
[multiple]="false"
/>
</mat-form-field>
<div class="pt-6">
<div class="mt-3">
<button
matSuffix
mat-icon-button
class="btn-secondary btn-secondary--icon-rounded-border"
color="primary"
id="planningManageTagsBtn1"
(click)="openTagsModal()"
Expand All @@ -60,22 +59,13 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
</div>
</div>

<div class="d-flex flex-row">
<div style="width: 450px" class="p-2">
<button
mat-icon-button
color="accent"
id="createFolder"
(click)="openFoldersModal()"
style="margin-left: -10px"
[disabled]="!taskForm.value.propertyId"
[matTooltip]="(!taskForm.value.propertyId ? 'Need to select property' : 'Select folder') | translate"
>
<mat-icon>folder</mat-icon>
</button>
<span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
</div>
</div>
<app-folder-tree-select
id="createFolder"
[nodes]="foldersTreeDto"
[selectedNodeId]="taskForm.get('folderId')?.value"
(nodeSelected)="onFolderSelected($event)"
[disabled]="!taskForm.value.propertyId"
></app-folder-tree-select>

<div class="d-flex flex-row">
<mat-form-field class="p-2">
Expand Down Expand Up @@ -108,11 +98,9 @@ <h3 mat-dialog-title>{{ 'Create new task' | translate }}</h3>
[multiple]="true"
/>
</mat-form-field>
<div class="pt-6">
<div class="mt-3">
<button
matSuffix
mat-icon-button
color="primary"
class="btn-secondary btn-secondary--icon-rounded-border"
id="planningManageTagsBtn2"
(click)="openTagsModal()"
matTooltip="{{ 'Manage tags' | translate }}"
Expand Down
9 changes: 8 additions & 1 deletion ...onents/task-wizard-actions/task-wizard-create-modal/task-wizard-create-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
dayOfWeekArr: { id: number, name: string }[] = [];
taskForm: FormGroup;
selectedFolderName: string = '';
selectedFolderId: number = null;
appLanguages: LanguagesModel = new LanguagesModel();
templateRequestModel: TemplateRequestModel = new TemplateRequestModel();
templatesModel: TemplateListModel = new TemplateListModel();
Expand Down Expand Up @@ -100,7 +101,7 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
return TaskWizardStatusesEnum;
}


constructor() {
this.typeahead
.pipe(
Expand Down Expand Up @@ -266,6 +267,12 @@ export class TaskWizardCreateModalComponent implements OnInit, OnDestroy {
});
}

onFolderSelected(folder: FolderDto) {
this.taskForm.patchValue({ folderId: folder.id });
this.selectedFolderId = folder.id;
this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
}

/*updateLanguageModel(translationsModel: CommonTranslationsModel, index: number) {
this.model.translates[index] = translationsModel;
}*/
Expand Down
148 changes: 69 additions & 79 deletions ...ents/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
{{ 'Status' | translate }}
</mat-slide-toggle>
<mat-slide-toggle *ngIf="selectCurrentUserIsAdmin$ | async"
class="p-2"
color="primary"
id="complianceEnabledToggle"
formControlName="complianceEnabled"
(change)="changeComplianceEnabled($event.checked)"
class="p-2"
color="primary"
id="complianceEnabledToggle"
formControlName="complianceEnabled"
(change)="changeComplianceEnabled($event.checked)"
>
{{ 'Compliance' | translate }}
</mat-slide-toggle>
Expand Down Expand Up @@ -59,29 +59,17 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
</button>
</div>
</div>
<div class="d-flex flex-row">
<div style="width: 450px" class="p-2">
<button
mat-icon-button
color="accent"
id="updateFolder"
(click)="openFoldersModal()"
style="margin-left: -10px"
[disabled]="

<app-folder-tree-select
id="updateFolder"
[nodes]="foldersTreeDto"
[selectedNodeId]="taskForm.get('folderId')?.value"
(nodeSelected)="onFolderSelected($event)"
[disabled]="
!taskForm.get('propertyId')?.value ||
taskForm.get('status')?.value === TaskWizardStatusesEnum.Active
"
[matTooltip]="
(!taskForm.get('propertyId')?.value
? 'Need to select property'
: 'Select folder') | translate
"
>
<mat-icon>folder</mat-icon>
</button>
<span>{{ selectedFolderName || ('Folder not selected' | translate) }}</span>
</div>
</div>
></app-folder-tree-select>

<div class="d-flex flex-row">
<mat-form-field class="p-3">
Expand Down Expand Up @@ -164,62 +152,64 @@ <h3 mat-dialog-title>{{ 'Edit task' | translate }}</h3>
>
</mat-form-field>-->
<div formArrayName="translates">
<ng-container
*ngFor="let translate of taskForm.get('translates')['controls']; let i = index"
[formGroupName]="i"
>
<ng-container *ngIf="i % 2 === 0">
<div class="d-flex flex-row">
<mat-form-field class="p-2">
<mat-label>{{ 'Task description' | translate }} ({{ getLanguageName(translate.get('languageId')?.value) }})
</mat-label>
<input
type="text"
id="updateName{{i}}"
matInput
formControlName="name"
[disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
>
</mat-form-field>
<mat-form-field *ngIf="taskForm.get('translates')['controls'][i + 1] as nextTranslate" class="p-2">
<mat-label>{{ 'Task description' | translate }} ({{ getLanguageName(nextTranslate.get('languageId')?.value) }})
</mat-label>
<input
type="text"
id="updateName{{i + 1}}"
matInput
[formControl]="nextTranslate.get('name')"
[disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
>
</mat-form-field>
</div>
<!-- <mat-card-->
<!-- [class.mt-2]="!isFirst"-->
<!-- [class.mb-2]="isLast">-->
<!-- <mat-card-title>{{getLanguageName(languageModel.languageId)}}</mat-card-title>-->
<!-- <mat-card-content>-->
<!-- <mat-form-field>-->
<!-- <mat-label>{{'Task description' | translate}}</mat-label>-->
<!-- <input-->
<!-- type="text"-->
<!-- id="updateName{{i}}"-->
<!-- matInput-->
<!-- [ngModel]="languageModel.name"-->
<!-- (ngModelChange)="updateName($event, i)"-->
<!-- [disabled]="model.status === TaskWizardStatusesEnum.Active"-->
<!-- >-->
<!-- </mat-form-field>-->
<!-- </mat-card-content>-->
<!-- </mat-card>-->
<ng-container
*ngFor="let translate of taskForm.get('translates')['controls']; let i = index"
[formGroupName]="i"
>
<ng-container *ngIf="i % 2 === 0">
<div class="d-flex flex-row">
<mat-form-field class="p-2">
<mat-label>{{ 'Task description' | translate }}
({{ getLanguageName(translate.get('languageId')?.value) }})
</mat-label>
<input
type="text"
id="updateName{{i}}"
matInput
formControlName="name"
[disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
>
</mat-form-field>
<mat-form-field *ngIf="taskForm.get('translates')['controls'][i + 1] as nextTranslate" class="p-2">
<mat-label>{{ 'Task description' | translate }}
({{ getLanguageName(nextTranslate.get('languageId')?.value) }})
</mat-label>
<input
type="text"
id="updateName{{i + 1}}"
matInput
[formControl]="nextTranslate.get('name')"
[disabled]="taskForm.get('status')?.value === TaskWizardStatusesEnum.Active || copyModel.status === TaskWizardStatusesEnum.Active"
>
</mat-form-field>
</div>
<!-- <mat-card-->
<!-- [class.mt-2]="!isFirst"-->
<!-- [class.mb-2]="isLast">-->
<!-- <mat-card-title>{{getLanguageName(languageModel.languageId)}}</mat-card-title>-->
<!-- <mat-card-content>-->
<!-- <mat-form-field>-->
<!-- <mat-label>{{'Task description' | translate}}</mat-label>-->
<!-- <input-->
<!-- type="text"-->
<!-- id="updateName{{i}}"-->
<!-- matInput-->
<!-- [ngModel]="languageModel.name"-->
<!-- (ngModelChange)="updateName($event, i)"-->
<!-- [disabled]="model.status === TaskWizardStatusesEnum.Active"-->
<!-- >-->
<!-- </mat-form-field>-->
<!-- </mat-card-content>-->
<!-- </mat-card>-->

<!--<app-eform-translation
[class.mt-2]="!isFirst"
[class.mb-2]="isLast"
[model]="languageModel"
(modelChange)="updateLanguageModel($event, i)"
[title]="getLanguageName(languageModel.languageId)"/>-->
<!--<app-eform-translation
[class.mt-2]="!isFirst"
[class.mb-2]="isLast"
[model]="languageModel"
(modelChange)="updateLanguageModel($event, i)"
[title]="getLanguageName(languageModel.languageId)"/>-->
</ng-container>
</ng-container>
</ng-container>
</div>
<div class="d-flex flex-row">
<mat-form-field class="p-2">
Expand Down
9 changes: 8 additions & 1 deletion ...onents/task-wizard-actions/task-wizard-update-modal/task-wizard-update-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
statuses: { label: string, value: number }[] = [];
foldersTreeDto: FolderDto[] = [];
selectedFolderName: string = '';
selectedFolderId: number;
repeatTypeDay: { name: string, id: number }[] = [];
repeatTypeWeek: { name: string, id: number }[] = [];
repeatTypeMonth: { name: string, id: number }[] = [];
Expand Down Expand Up @@ -102,7 +103,7 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
return R.equals(this.taskForm.value, this.copyModel);
}


constructor() {
this.typeahead
.pipe(
Expand Down Expand Up @@ -316,6 +317,12 @@ export class TaskWizardUpdateModalComponent implements OnInit, OnDestroy {
}
}

onFolderSelected(folder: FolderDto) {
this.taskForm.patchValue({ folderId: folder.id });
this.selectedFolderId = folder.id;
this.selectedFolderName = findFullNameById(folder.id, this.foldersTreeDto);
}

update() {

const task: TaskWizardCreateModel = {
Expand Down
10 changes: 5 additions & 5 deletions ...-pn/modules/task-wizard/components/task-wizard-filters/task-wizard-filters.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="d-flex flex-column" [formGroup]="filtersForm">
<div class="d-flex need-wrapper">
<div class="d-flex flex-row align-items-center gap-12 px-3" [formGroup]="filtersForm">
<!-- <div class="d-flex need-wrapper">-->
<mat-form-field>
<mat-label>{{'Location' | translate}}</mat-label>
<mtx-select
Expand All @@ -22,8 +22,8 @@
[bindLabel]="'name'"
/>
</mat-form-field>
</div>
<div class="d-flex need-wrapper">
<!-- </div>-->
<!-- <div class="d-flex need-wrapper">-->
<mat-form-field>
<mat-label>{{'Tags' | translate}}</mat-label>
<mtx-select
Expand Down Expand Up @@ -58,4 +58,4 @@
/>
</mat-form-field>
</div>
</div>
<!--</div>-->
12 changes: 1 addition & 11 deletions ...ration-pn/modules/task-wizard/components/task-wizard-page/task-wizard-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
<eform-new-subheader>
<!-- <button-->
<!-- mat-icon-button-->
<!-- color="primary"-->
<!-- id="planningManageTagsBtn"-->
<!-- (click)="openTagsModal()"-->
<!-- matTooltip="{{ 'Manage tags' | translate }}"-->
<!-- *ngIf="authStateService.isAdmin"-->
<!-- >-->
<!-- <mat-icon>discount</mat-icon>-->
<!-- </button>-->
<button
class="btn-primary btn-primary--icon-left"
[matTooltip]="'Create new task' | translate"
Expand Down Expand Up @@ -37,7 +27,7 @@
/>
<button
*ngIf="selectAuthIsAdmin$ | async;"
class="btn-warning mb-4"
class="btn-warning mb-4 ml-3"
[disabled]="
!selectedPlanningsCheckboxes || selectedPlanningsCheckboxes.length === 0
"
Expand Down
4 changes: 4 additions & 0 deletions ...rc/app/plugins/modules/backend-configuration-pn/modules/task-wizard/task-wizard.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ import {MatCardModule} from '@angular/material/card';
import {PlanningsModule} from '../../../items-planning-pn/modules/plannings/plannings.module';
import {StatisticsModule} from '../statistics/statistics.module';
import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
import {
FolderTreeSelectComponent
} from "src/app/common/modules/eform-shared/components/eform-tree-select/folder-tree-select.component";

@NgModule({
imports: [
Expand Down Expand Up @@ -57,6 +60,7 @@ import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
MatMenu,
MatMenuItem,
MatMenuTrigger,
FolderTreeSelectComponent,
],
declarations: [
TaskWizardFiltersComponent,
Expand Down
Loading