clean code
This commit is contained in:
parent
013b1f9931
commit
59ed73caae
2 changed files with 12 additions and 15 deletions
|
|
@ -322,6 +322,7 @@
|
||||||
? 'block'
|
? 'block'
|
||||||
: 'none'
|
: 'none'
|
||||||
}"
|
}"
|
||||||
|
(click)="deleteTaskData(overlayData)"
|
||||||
></app-form-btn>
|
></app-form-btn>
|
||||||
<app-form-btn
|
<app-form-btn
|
||||||
[class]="'btn-submit'"
|
[class]="'btn-submit'"
|
||||||
|
|
|
||||||
|
|
@ -66,13 +66,8 @@ export class AddTaskComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
loadEditTaskData() {
|
loadEditTaskData() {
|
||||||
if (
|
const excludedValues = ['', 'todo', 'inprogress', 'awaitfeedback', 'done'];
|
||||||
this.overlayData !== '' &&
|
if (!excludedValues.includes(this.overlayData)) {
|
||||||
this.overlayData !== 'todo' &&
|
|
||||||
this.overlayData !== 'inprogress' &&
|
|
||||||
this.overlayData !== 'awaitfeedback' &&
|
|
||||||
this.overlayData !== 'done'
|
|
||||||
) {
|
|
||||||
const taskData = this.getTaskData(this.overlayData)[0];
|
const taskData = this.getTaskData(this.overlayData)[0];
|
||||||
Object.assign(this.taskData, taskData);
|
Object.assign(this.taskData, taskData);
|
||||||
} else if (this.overlayType === 'newTaskOverlay') {
|
} else if (this.overlayType === 'newTaskOverlay') {
|
||||||
|
|
@ -219,15 +214,16 @@ export class AddTaskComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
onSubmit(ngForm: NgForm, overlayData: string) {
|
onSubmit(ngForm: NgForm, overlayData: string) {
|
||||||
|
const allowedValues = [
|
||||||
|
'',
|
||||||
|
'none',
|
||||||
|
'todo',
|
||||||
|
'inprogress',
|
||||||
|
'awaitfeedback',
|
||||||
|
'done',
|
||||||
|
];
|
||||||
if (ngForm.submitted && ngForm.form.valid) {
|
if (ngForm.submitted && ngForm.form.valid) {
|
||||||
if (
|
if (allowedValues.includes(overlayData)) {
|
||||||
overlayData === '' ||
|
|
||||||
overlayData === 'none' ||
|
|
||||||
overlayData === 'todo' ||
|
|
||||||
overlayData === 'inprogress' ||
|
|
||||||
overlayData === 'awaitfeedback' ||
|
|
||||||
overlayData === 'done'
|
|
||||||
) {
|
|
||||||
const { id, ...taskWithoutId } = this.taskData;
|
const { id, ...taskWithoutId } = this.taskData;
|
||||||
this.firebaseService.addNewTask(taskWithoutId);
|
this.firebaseService.addNewTask(taskWithoutId);
|
||||||
this.removeTaskData();
|
this.removeTaskData();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue