-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b20562a
commit 47e2ae5
Showing
9 changed files
with
73 additions
and
37 deletions.
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
1 change: 1 addition & 0 deletions
1
libs/mix-share/src/components/user-select/user-select.component.html
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
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
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
70 changes: 42 additions & 28 deletions
70
...are/src/modules/task-manage/components/task-detail-modal/task-detail-modal.component.html
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,63 +1,77 @@ | ||
| <div class="task-detail" | ||
| [formGroup]="taskForm"> | ||
| <div class="task-detail" [formGroup]="taskForm"> | ||
| <div class="d-flex gap-2 align-items-center"> | ||
| <img [src]="TaskTypeIconDisplay[task.type]"> | ||
| <img [src]="TaskTypeIconDisplay[task.type]" /> | ||
| <span>{{ task.type }}-{{ task.id }}</span> | ||
| </div> | ||
|
|
||
| <div class="row mt-2"> | ||
| <div class="col-12 col-md-8"> | ||
| <mix-inline-input formControlName="title"></mix-inline-input> | ||
|
|
||
| <div class="mt-4 mb-2 text-500 text-l text-sub">Description</div> | ||
| <div class="mt-4 mb-2 text-500 text-m text-sub">Description</div> | ||
|
|
||
| <mix-rich-text-editor class="description" | ||
| formControlName="description"></mix-rich-text-editor> | ||
| <mix-rich-text-editor | ||
| class="description" | ||
| formControlName="description" | ||
| ></mix-rich-text-editor> | ||
|
|
||
| <div class="mt-4 mb-2 text-500 text-l text-sub">Comment(s)</div> | ||
| <div class="mt-4 mb-2 text-500 text-m text-sub">Comment(s)</div> | ||
| </div> | ||
|
|
||
| <div class="col-12 col-md-4"> | ||
| <div class="mb-2 text-500 text-l text-sub">STATUS</div> | ||
| <div class="mb-2 text-500 text-m text-sub">STATUS</div> | ||
|
|
||
| <mix-select [items]="statusItems" | ||
| [labelProcess]="statussLabel" | ||
| formControlName="taskStatus"></mix-select> | ||
| <mix-select | ||
| [items]="statusItems" | ||
| [labelProcess]="statussLabel" | ||
| formControlName="taskStatus" | ||
| ></mix-select> | ||
|
|
||
| <div class="mt-4 mb-2 text-500 text-l text-sub">REPORTER</div> | ||
| <div class="mt-4 mb-2 text-500 text-m text-sub">REPORTER</div> | ||
|
|
||
| <mix-user-select formControlName="reporter"></mix-user-select> | ||
|
|
||
| <div class="mt-4 mb-2 text-500 text-l text-sub">PRORITY</div> | ||
| <div class="mt-4 mb-2 text-500 text-m text-sub">PRORITY</div> | ||
|
|
||
| <mix-select [items]="prorityItems" | ||
| [labelProcess]="priorityLabel" | ||
| formControlName="taskPriority"></mix-select> | ||
| <mix-select | ||
| [items]="prorityItems" | ||
| [labelProcess]="priorityLabel" | ||
| formControlName="taskPriority" | ||
| ></mix-select> | ||
|
|
||
| <div class="mt-4 text-s text-sub"> | ||
| <div> | ||
| Created at | ||
| {{ task.createdDateTime | mixDate | date: 'dd/MM/yyyy hh:mm' }} | ||
| {{ task.createdDateTime | mixDate | date : 'dd/MM/yyyy hh:mm' }} | ||
| </div> | ||
| <div> | ||
| Updated at | ||
| {{ task.lastModified | mixDate | date: 'dd/MM/yyyy hh:mm' || '--' }} | ||
| {{ task.lastModified | mixDate | date : 'dd/MM/yyyy hh:mm' || '--' }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div *ngIf="loadingState$ | async as state" | ||
| class="mt-3 gap-2 d-flex align-items-center justify-content-start"> | ||
| <mix-button type="outline" | ||
| [disabled]="state === 'Loading'" | ||
| (click)="dialogRef.close()">Close</mix-button> | ||
| <div | ||
| *ngIf="loadingState$ | async as state" | ||
| class="mt-3 gap-2 d-flex align-items-center justify-content-start" | ||
| > | ||
| <mix-button | ||
| type="outline" | ||
| [disabled]="state === 'Loading'" | ||
| (click)="dialogRef.close()" | ||
| >Close</mix-button | ||
| > | ||
|
|
||
| <mix-button class="ms-auto" | ||
| [loading]="state === 'Loading'" | ||
| (click)="saveTask(false)">Save</mix-button> | ||
| <mix-button | ||
| class="ms-auto" | ||
| [loading]="state === 'Loading'" | ||
| (click)="saveTask(false)" | ||
| >Save</mix-button | ||
| > | ||
|
|
||
| <mix-button [loading]="state === 'Loading'" | ||
| (click)="saveTask()">Save & Close</mix-button> | ||
| <mix-button [loading]="state === 'Loading'" (click)="saveTask()" | ||
| >Save & Close</mix-button | ||
| > | ||
| </div> | ||
| </div> |
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
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
2 changes: 1 addition & 1 deletion
2
...share/src/modules/task-manage/components/task-parent-card/task-parent-card.component.html
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
2 changes: 1 addition & 1 deletion
2
libs/mix-share/src/modules/task-manage/task-manage.component.scss
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
47e2ae5There 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.
Successfully deployed to the following URLs:
mix-portal-angular – ./
mix-portal-angular-git-master-mixcore.vercel.app
mix-portal-angular-mixcore.vercel.app
mix-portal-angular.vercel.app
admin.mixcore.dev
studio.mixcore.net