diff --git a/src/app/core/fuseUtils.ts b/src/app/core/fuseUtils.ts index 66f706ed..fcacfa09 100644 --- a/src/app/core/fuseUtils.ts +++ b/src/app/core/fuseUtils.ts @@ -84,4 +84,14 @@ export class FuseUtils } return false; } + + public static genearateGUID() + { + function S4() + { + return (((1 + Math.random()) * 0x10000) || 0).toString(16).substring(1); + } + + return (S4() + S4()); + } } diff --git a/src/app/main/apps/calendar/event-form/event-form.component.html b/src/app/main/apps/calendar/event-form/event-form.component.html index b3396e26..170ef2af 100644 --- a/src/app/main/apps/calendar/event-form/event-form.component.html +++ b/src/app/main/apps/calendar/event-form/event-form.component.html @@ -115,7 +115,7 @@ md-raised-button (click)="dialogRef.close(eventForm)" class="save-button mat-accent" - [disabled]="eventForm.pristine" + [disabled]="eventForm.invalid" aria-label="SAVE"> SAVE @@ -124,7 +124,7 @@ md-raised-button (click)="dialogRef.close(['save',eventForm])" class="save-button mat-accent" - [disabled]="eventForm.pristine" + [disabled]="eventForm.invalid" aria-label="SAVE"> SAVE diff --git a/src/app/main/apps/chat/chat.service.ts b/src/app/main/apps/chat/chat.service.ts index 59998e4b..7996a17a 100644 --- a/src/app/main/apps/chat/chat.service.ts +++ b/src/app/main/apps/chat/chat.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { Http } from '@angular/http'; import { Subject } from 'rxjs/Subject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { FuseUtils } from '../../../core/fuseUtils'; @Injectable() export class ChatService implements Resolve @@ -80,7 +81,7 @@ export class ChatService implements Resolve return item.id === contactId; }); - const chatId = this.guidGenerator(); + const chatId = FuseUtils.genearateGUID(); const chat = { id : chatId, @@ -243,18 +244,4 @@ export class ChatService implements Resolve }, reject); }); } - - /** - * Random ID Generator - * @returns {string} - */ - guidGenerator() - { - function S4() - { - return (((1 + Math.random()) * 0x10000) || 0).toString(16).substring(1); - } - - return (S4() + S4()); - } } diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html index e0476296..b2969663 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html @@ -22,6 +22,15 @@
+
+ +
+
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss index 4e646178..b3a7e55f 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss @@ -26,5 +26,9 @@ .content { padding: 0 !important; + + .add-todo-button { + width: 100%; + } } } diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts index f9aaaf47..0736b8ac 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { TodoService } from '../../todo.service'; import { Subscription } from 'rxjs/Subscription'; +import { Router } from '@angular/router'; @Component({ selector : 'fuse-todo-main-sidenav', @@ -18,7 +19,7 @@ export class MainSidenavComponent implements OnInit, OnDestroy onFiltersChanged: Subscription; onTagsChanged: Subscription; - constructor(private todoService: TodoService) + constructor(private todoService: TodoService, private router: Router) { // Data this.accounts = { @@ -49,4 +50,13 @@ export class MainSidenavComponent implements OnInit, OnDestroy this.onFiltersChanged.unsubscribe(); this.onTagsChanged.unsubscribe(); } + + newTodo() + { + this.router.navigate(['/apps/todo/all']).then(() => { + setTimeout(() => { + this.todoService.onNewTodoClicked.next(''); + }); + }); + } } diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.html b/src/app/main/apps/todo/todo-details/todo-details.component.html index fc4ad78f..2e1a1576 100644 --- a/src/app/main/apps/todo/todo-details/todo-details.component.html +++ b/src/app/main/apps/todo/todo-details/todo-details.component.html @@ -46,14 +46,16 @@
-
+ @@ -96,6 +98,11 @@ mdAutosizeMinRows="6"> + +
diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.ts b/src/app/main/apps/todo/todo-details/todo-details.component.ts index c57e2852..8101cb9a 100644 --- a/src/app/main/apps/todo/todo-details/todo-details.component.ts +++ b/src/app/main/apps/todo/todo-details/todo-details.component.ts @@ -1,8 +1,9 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { AfterViewInit, Component, OnDestroy, OnInit, ViewChildren } from '@angular/core'; import { TodoService } from '../todo.service'; import { Todo } from '../todo.model'; import { Subscription } from 'rxjs/Subscription'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { FuseUtils } from '../../../../core/fuseUtils'; @Component({ selector : 'fuse-todo-details', @@ -13,17 +14,19 @@ export class TodoDetailsComponent implements OnInit, OnDestroy { todo: Todo; tags: any[]; + formType: string; todoForm: FormGroup; + @ViewChildren('titleInput') titleInputField; onFormChange: any; onCurrentTodoChanged: Subscription; onTagsChanged: Subscription; + onNewTodoClicked: Subscription; constructor(private todoService: TodoService, private formBuilder: FormBuilder) { - } ngOnInit() @@ -31,12 +34,16 @@ export class TodoDetailsComponent implements OnInit, OnDestroy // Subscribe to update the current todo this.onCurrentTodoChanged = this.todoService.onCurrentTodoChanged - .subscribe(currentTodo => { - this.todo = currentTodo; + .subscribe(todo => { + + this.formType = 'edit'; + + this.todo = todo; if ( this.todo ) { this.todoForm = this.createTodoForm(); + this.onFormChange = this.todoForm.valueChanges .debounceTime(500) .distinctUntilChanged() @@ -52,6 +59,23 @@ export class TodoDetailsComponent implements OnInit, OnDestroy .subscribe(labels => { this.tags = labels; }); + + // Subscribe to update on tag change + this.onNewTodoClicked = this.todoService.onNewTodoClicked + .subscribe(() => { + this.todo = new Todo({}); + this.todo.id = FuseUtils.genearateGUID(); + this.formType = 'new'; + this.todoForm = this.createTodoForm(); + this.focusTitleField(); + }); + } + + focusTitleField() + { + setTimeout(() => { + this.titleInputField.first.nativeElement.focus(); + }); } createTodoForm() @@ -120,12 +144,20 @@ export class TodoDetailsComponent implements OnInit, OnDestroy this.todoService.toggleTagOnTodo(tagId, this.todo); } + addTodo() + { + this.todoService.updateTodo(this.todoForm.getRawValue()); + } + ngOnDestroy() { if ( this.onFormChange ) { this.onFormChange.unsubscribe(); } + this.onCurrentTodoChanged.unsubscribe(); + + this.onNewTodoClicked.unsubscribe(); } } diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss index 730811e2..37dfb2db 100644 --- a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss +++ b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss @@ -24,6 +24,12 @@ user-select: none; } + &.move-disabled { + .handle { + display: none; + } + } + .tags { font-size: 12px; diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts index 4a3003f5..a14c445f 100644 --- a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts +++ b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts @@ -2,6 +2,7 @@ import { Component, HostBinding, Input, OnDestroy, OnInit, ViewEncapsulation } f import { Todo } from '../../todo.model'; import { TodoService } from '../../todo.service'; import { Subscription } from 'rxjs/Subscription'; +import { ActivatedRoute, ActivatedRouteSnapshot, Route, Router } from '@angular/router'; @Component({ selector : 'fuse-todo-list-item', @@ -15,12 +16,19 @@ export class TodoListItemComponent implements OnInit, OnDestroy tags: any[]; @HostBinding('class.selected') selected: boolean; @HostBinding('class.completed') completed: boolean; + @HostBinding('class.move-disabled') moveDisabled: boolean; onSelectedTodosChanged: Subscription; onTagsChanged: Subscription; - constructor(private todoService: TodoService) + constructor(private todoService: TodoService, + private route: ActivatedRoute) { + // Disable move if path is not /all + if ( route.snapshot.url[0].path !== 'all' ) + { + this.moveDisabled = true; + } } ngOnInit() diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.html b/src/app/main/apps/todo/todo-list/todo-list.component.html index 1c630129..460c949f 100644 --- a/src/app/main/apps/todo/todo-list/todo-list.component.html +++ b/src/app/main/apps/todo/todo-list/todo-list.component.html @@ -1,7 +1,7 @@
There are no todos!
-
+
@@ -26,8 +27,10 @@ export class TodoService implements Resolve onFiltersChanged: BehaviorSubject = new BehaviorSubject([]); onTagsChanged: BehaviorSubject = new BehaviorSubject([]); onSearchTextChanged: BehaviorSubject = new BehaviorSubject(''); + onNewTodoClicked: Subject = new Subject(); - constructor(private http: Http) + constructor(private http: Http, + private location: Location) { this.selectedTodos = []; } @@ -317,6 +320,23 @@ export class TodoService implements Resolve }); this.onCurrentTodoChanged.next(this.currentTodo); + + const tagHandle = this.routeParams.tagHandle, + filterHandle = this.routeParams.filterHandle; + + if ( tagHandle ) + { + this.location.go('apps/todo/tag/' + tagHandle + '/' + id); + } + else if ( filterHandle ) + { + this.location.go('apps/todo/filter/' + filterHandle + '/' + id); + } + else + { + this.location.go('apps/todo/all/' + id); + } + } /** @@ -360,10 +380,7 @@ export class TodoService implements Resolve this.getTodos().then(todos => { - if ( todos && this.currentTodo ) - { - this.setCurrentTodo(this.currentTodo.id); - } + this.setCurrentTodo(todo.id); resolve(todos); @@ -371,4 +388,27 @@ export class TodoService implements Resolve }); }); } + + /** + * Update the todo + * @param todo + * @returns {Promise} + */ + updateTodos(todos) + { + + /* return new Promise((resolve, reject) => { + + this.http.post('api/todo-todos/', {...todos}) + + .subscribe(response => { + + this.getTodos().then(_todos => { + console.log(response); + resolve(_todos); + }, reject); + }); + });*/ + + } }