cosmetic tuning
parent
7ed157625b
commit
27d92ed2dd
|
@ -17,14 +17,14 @@
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/common": "^4.0.0",
|
"@angular/common": "4.0.0",
|
||||||
"@angular/compiler": "^4.0.0",
|
"@angular/compiler": "4.0.0",
|
||||||
"@angular/core": "^4.0.0",
|
"@angular/core": "4.0.0",
|
||||||
"@angular/forms": "^4.0.0",
|
"@angular/forms": "4.0.0",
|
||||||
"@angular/http": "^4.0.0",
|
"@angular/http": "4.0.0",
|
||||||
"@angular/platform-browser": "^4.0.0",
|
"@angular/platform-browser": "4.0.0",
|
||||||
"@angular/platform-browser-dynamic": "^4.0.0",
|
"@angular/platform-browser-dynamic": "4.0.0",
|
||||||
"@angular/router": "^4.0.0",
|
"@angular/router": "4.0.0",
|
||||||
"bootstrap": "^3.3.7",
|
"bootstrap": "^3.3.7",
|
||||||
"core-js": "^2.4.1",
|
"core-js": "^2.4.1",
|
||||||
"jquery": "^3.1.0",
|
"jquery": "^3.1.0",
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "1.0.0",
|
"@angular/cli": "1.0.0",
|
||||||
"@angular/compiler-cli": "^4.0.0",
|
"@angular/compiler-cli": "4.0.0",
|
||||||
"@types/jasmine": "2.5.38",
|
"@types/jasmine": "2.5.38",
|
||||||
"@types/node": "~6.0.60",
|
"@types/node": "~6.0.60",
|
||||||
"@types/socket.io-client": "^1.4.26",
|
"@types/socket.io-client": "^1.4.26",
|
||||||
|
|
|
@ -8,6 +8,7 @@ import {Component} from '@angular/core';
|
||||||
})
|
})
|
||||||
export class AboutComponent {
|
export class AboutComponent {
|
||||||
|
|
||||||
constructor() {}
|
constructor() {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,11 +13,11 @@ li {
|
||||||
padding-right: 15px;
|
padding-right: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.right {
|
.right {
|
||||||
float: right;
|
float: right;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.left {
|
.left {
|
||||||
float: left;
|
float: left;
|
||||||
width: calc(100% - 300px);
|
width: calc(100% - 300px);
|
||||||
|
|
|
@ -50,7 +50,8 @@
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
|
||||||
|
aria-expanded="false">
|
||||||
Schnellzugriff
|
Schnellzugriff
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -11,6 +11,7 @@ import {Title} from '@angular/platform-browser';
|
||||||
export class DashboardComponent {
|
export class DashboardComponent {
|
||||||
|
|
||||||
title: string;
|
title: string;
|
||||||
|
|
||||||
constructor(r: ActivatedRoute, private router: Router, private titleService: Title) {
|
constructor(r: ActivatedRoute, private router: Router, private titleService: Title) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +23,7 @@ export class DashboardComponent {
|
||||||
this.titleService.setTitle(this.title);
|
this.titleService.setTitle(this.title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
this.titleService.setTitle(this.originalTitle);
|
this.titleService.setTitle(this.originalTitle);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,18 @@
|
||||||
.form-signin
|
.form-signin {
|
||||||
{
|
|
||||||
max-width: 330px;
|
max-width: 330px;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
.form-signin .form-signin-heading, .form-signin .checkbox
|
|
||||||
{
|
.form-signin .form-signin-heading, .form-signin .checkbox {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
.form-signin .checkbox
|
|
||||||
{
|
.form-signin .checkbox {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
.form-signin .form-control
|
|
||||||
{
|
.form-signin .form-control {
|
||||||
position: relative;
|
position: relative;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
@ -22,24 +21,24 @@
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
.form-signin .form-control:focus
|
|
||||||
{
|
.form-signin .form-control:focus {
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
.form-signin input[type="text"]
|
|
||||||
{
|
.form-signin input[type="text"] {
|
||||||
margin-bottom: -1px;
|
margin-bottom: -1px;
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
border-bottom-right-radius: 0;
|
border-bottom-right-radius: 0;
|
||||||
}
|
}
|
||||||
.form-signin input[type="password"]
|
|
||||||
{
|
.form-signin input[type="password"] {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
border-top-right-radius: 0;
|
border-top-right-radius: 0;
|
||||||
}
|
}
|
||||||
.account-wall
|
|
||||||
{
|
.account-wall {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
padding: 40px 0px 20px 0px;
|
padding: 40px 0px 20px 0px;
|
||||||
background-color: #f7f7f7;
|
background-color: #f7f7f7;
|
||||||
|
@ -47,15 +46,15 @@
|
||||||
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
|
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
|
||||||
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
|
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
.login-title
|
|
||||||
{
|
.login-title {
|
||||||
color: #555;
|
color: #555;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
.profile-img
|
|
||||||
{
|
.profile-img {
|
||||||
width: 96px;
|
width: 96px;
|
||||||
height: 96px;
|
height: 96px;
|
||||||
margin: 0 auto 10px;
|
margin: 0 auto 10px;
|
||||||
|
@ -64,12 +63,12 @@
|
||||||
-webkit-border-radius: 50%;
|
-webkit-border-radius: 50%;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
.need-help
|
|
||||||
{
|
.need-help {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
.new-account
|
|
||||||
{
|
.new-account {
|
||||||
display: block;
|
display: block;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {CanActivate,
|
import {
|
||||||
|
CanActivate,
|
||||||
Router,
|
Router,
|
||||||
ActivatedRouteSnapshot,
|
ActivatedRouteSnapshot,
|
||||||
RouterStateSnapshot } from '@angular/router';
|
RouterStateSnapshot
|
||||||
|
} from '@angular/router';
|
||||||
import {Observable} from 'rxjs/Observable';
|
import {Observable} from 'rxjs/Observable';
|
||||||
import {LoginService} from "../services/login-service/login-service";
|
import {LoginService} from "../services/login-service/login-service";
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
export class MockSocket {
|
export class MockSocket {
|
||||||
emit(action, data) {
|
emit(action, data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
addEventListener(l) {
|
addEventListener(l) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
removeEventListener(l) {
|
removeEventListener(l) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,11 +4,14 @@ import {ModelDrivenFormComponent} from './model-driven-form.component';
|
||||||
import {UserService} from '../services/user-service/user.service';
|
import {UserService} from '../services/user-service/user.service';
|
||||||
import {TaskServiceModelForm} from "../services/task-service/task-model-form.service";
|
import {TaskServiceModelForm} from "../services/task-service/task-model-form.service";
|
||||||
import {ShowErrorComponentModelDriven} from "../show-error/show-error-model-driven.component";
|
import {ShowErrorComponentModelDriven} from "../show-error/show-error-model-driven.component";
|
||||||
import {generateRandomString} from "../../test/test.helper";
|
import {generateRandomString} from "../test/test.helper";
|
||||||
|
|
||||||
describe('Model Driven Form', () => {
|
describe('Model Driven Form', () => {
|
||||||
|
|
||||||
|
// ModelDrivenFormComponent Fixture
|
||||||
let fixture;
|
let fixture;
|
||||||
|
|
||||||
|
// main FormGroup
|
||||||
let form;
|
let form;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
@ -33,13 +36,17 @@ describe('Model Driven Form', () => {
|
||||||
const tagControlGroup: FormGroup = fixture.componentInstance.createTagControl()
|
const tagControlGroup: FormGroup = fixture.componentInstance.createTagControl()
|
||||||
const tagLabel = tagControlGroup.get('label');
|
const tagLabel = tagControlGroup.get('label');
|
||||||
expectErrorOnInput(tagLabel, '');
|
expectErrorOnInput(tagLabel, '');
|
||||||
|
expectErrorOnInput(tagLabel, 'xyz');
|
||||||
expectErrorOnInput(tagLabel, 'xy', {requiredLength: 3, actualLength: 2}, 'minlength');
|
expectErrorOnInput(tagLabel, 'xy', {requiredLength: 3, actualLength: 2}, 'minlength');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show error in description gt 2000 signs', () => {
|
it('should show error in description gt 2000 signs', () => {
|
||||||
const descriptionControl = form.get('description');
|
const descriptionControl = form.get('description');
|
||||||
expectErrorOnInput(descriptionControl, generateRandomString(2000));
|
expectErrorOnInput(descriptionControl, generateRandomString(2000));
|
||||||
expectErrorOnInput(descriptionControl, generateRandomString(2001), {requiredLength: 2000, actualLength: 2001}, 'maxlength');
|
expectErrorOnInput(descriptionControl, generateRandomString(2001), {
|
||||||
|
requiredLength: 2000,
|
||||||
|
actualLength: 2001
|
||||||
|
}, 'maxlength');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show error on email not matching email-pattern', () => {
|
it('should show error on email not matching email-pattern', () => {
|
||||||
|
@ -52,6 +59,8 @@ describe('Model Driven Form', () => {
|
||||||
expectErrorOnInput(assigneeEMail, 'test@web.de');
|
expectErrorOnInput(assigneeEMail, 'test@web.de');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// helper method
|
||||||
|
// check for error object according to given input value
|
||||||
function expectErrorOnInput(formControl, inputString, expectedErrorObject?, expectedErrorAttribute?) {
|
function expectErrorOnInput(formControl, inputString, expectedErrorObject?, expectedErrorAttribute?) {
|
||||||
formControl.setValue(inputString);
|
formControl.setValue(inputString);
|
||||||
if (expectedErrorObject && expectedErrorAttribute) {
|
if (expectedErrorObject && expectedErrorAttribute) {
|
||||||
|
@ -63,5 +72,4 @@ describe('Model Driven Form', () => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core';
|
||||||
})
|
})
|
||||||
export class NotFoundComponent implements OnInit {
|
export class NotFoundComponent implements OnInit {
|
||||||
|
|
||||||
constructor() {}
|
constructor() {
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,8 @@ export class TaskService {
|
||||||
.map(res => res.json())
|
.map(res => res.json())
|
||||||
.do((tasks) => {
|
.do((tasks) => {
|
||||||
this.taskStore.dispatch({type: LOAD, data: tasks});
|
this.taskStore.dispatch({type: LOAD, data: tasks});
|
||||||
}).subscribe(_ => {});
|
}).subscribe(_ => {
|
||||||
|
});
|
||||||
|
|
||||||
return this.tasks$;
|
return this.tasks$;
|
||||||
}
|
}
|
||||||
|
@ -67,6 +68,7 @@ export class TaskService {
|
||||||
this.socket.emit('broadcast_task', action);
|
this.socket.emit('broadcast_task', action);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteTask(task: Task) {
|
deleteTask(task: Task) {
|
||||||
return this.http.delete(BASE_URL + task.id)
|
return this.http.delete(BASE_URL + task.id)
|
||||||
.do(response => {
|
.do(response => {
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
import {Observable} from 'rxjs/Observable';
|
import {Observable} from 'rxjs/Observable';
|
||||||
export class UserService {
|
export class UserService {
|
||||||
checkUserExists(name: string): Observable<boolean> {
|
checkUserExists(name: string): Observable<boolean> {
|
||||||
|
|
|
@ -27,6 +27,7 @@ export class SettingsComponent {
|
||||||
this.titleService.setTitle(title);
|
this.titleService.setTitle(title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
this.titleService.setTitle(this.originalTitle);
|
this.titleService.setTitle(this.originalTitle);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,8 @@ import {NgForm, FormGroup, FormGroupDirective} from '@angular/forms';
|
||||||
<div *ngFor="let errorMessage of errorMessages">
|
<div *ngFor="let errorMessage of errorMessages">
|
||||||
{{errorMessage}}
|
{{errorMessage}}
|
||||||
</div>
|
</div>
|
||||||
</div>` })
|
</div>`
|
||||||
|
})
|
||||||
export class ShowErrorComponentModelDriven {
|
export class ShowErrorComponentModelDriven {
|
||||||
|
|
||||||
@Input('path') path;
|
@Input('path') path;
|
||||||
|
|
|
@ -8,7 +8,8 @@ import {NgForm, FormGroup} from '@angular/forms';
|
||||||
<div *ngFor="let errorMessage of errorMessages">
|
<div *ngFor="let errorMessage of errorMessages">
|
||||||
{{errorMessage}}
|
{{errorMessage}}
|
||||||
</div>
|
</div>
|
||||||
</div>` })
|
</div>`
|
||||||
|
})
|
||||||
export class ShowErrorComponent {
|
export class ShowErrorComponent {
|
||||||
|
|
||||||
@Input('path') controlPath;
|
@Input('path') controlPath;
|
||||||
|
|
|
@ -17,12 +17,19 @@ export var EditTaskComponent = (function () {
|
||||||
this.task = createInitialTask();
|
this.task = createInitialTask();
|
||||||
this.saved = false;
|
this.saved = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
EditTaskComponent.prototype.ngOnInit = function () {
|
EditTaskComponent.prototype.ngOnInit = function () {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
this.subscription = this.route.params
|
this.subscription = this.route.params
|
||||||
.map(function (params) { return params['id']; })
|
.map(function (params) {
|
||||||
.filter(function (id) { return id != undefined; })
|
return params['id'];
|
||||||
.flatMap(function (id) { return _this.taskService.getTask(id); })
|
})
|
||||||
|
.filter(function (id) {
|
||||||
|
return id != undefined;
|
||||||
|
})
|
||||||
|
.flatMap(function (id) {
|
||||||
|
return _this.taskService.getTask(id);
|
||||||
|
})
|
||||||
.subscribe(function (task) {
|
.subscribe(function (task) {
|
||||||
_this.task = task;
|
_this.task = task;
|
||||||
});
|
});
|
||||||
|
@ -59,10 +66,12 @@ export var EditTaskComponent = (function () {
|
||||||
return window.confirm("Ihr Formular besitzt ungespeicherte \u00C4nderungen, m\u00F6chten Sie die Seite wirklich verlassen?");
|
return window.confirm("Ihr Formular besitzt ungespeicherte \u00C4nderungen, m\u00F6chten Sie die Seite wirklich verlassen?");
|
||||||
};
|
};
|
||||||
EditTaskComponent.decorators = [
|
EditTaskComponent.decorators = [
|
||||||
{ type: Component, args: [{
|
{
|
||||||
|
type: Component, args: [{
|
||||||
templateUrl: './edit-task.component.html',
|
templateUrl: './edit-task.component.html',
|
||||||
styleUrls: ['./edit-task.component.css']
|
styleUrls: ['./edit-task.component.css']
|
||||||
},] },
|
},]
|
||||||
|
},
|
||||||
];
|
];
|
||||||
/** @nocollapse */
|
/** @nocollapse */
|
||||||
EditTaskComponent.ctorParameters = [
|
EditTaskComponent.ctorParameters = [
|
||||||
|
|
|
@ -1 +1,10 @@
|
||||||
{"version":3,"file":"edit-task.component.js","sourceRoot":"","sources":["edit-task.component.ts"],"names":[],"mappings":"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"}
|
{
|
||||||
|
"version": 3,
|
||||||
|
"file": "edit-task.component.js",
|
||||||
|
"sourceRoot": "",
|
||||||
|
"sources": [
|
||||||
|
"edit-task.component.ts"
|
||||||
|
],
|
||||||
|
"names": [],
|
||||||
|
"mappings": "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"
|
||||||
|
}
|
||||||
|
|
|
@ -26,8 +26,7 @@ export class EditTaskComponent {
|
||||||
|
|
||||||
subscription: Subscription;
|
subscription: Subscription;
|
||||||
|
|
||||||
constructor(
|
constructor(private route: ActivatedRoute,
|
||||||
private route: ActivatedRoute,
|
|
||||||
private taskService: TaskService,
|
private taskService: TaskService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private titleService: Title,
|
private titleService: Title,
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
|
||||||
export var EditTaskGuard = (function () {
|
export var EditTaskGuard = (function () {
|
||||||
function EditTaskGuard() {
|
function EditTaskGuard() {
|
||||||
}
|
}
|
||||||
|
|
||||||
EditTaskGuard.prototype.canDeactivate = function (component, route, router) {
|
EditTaskGuard.prototype.canDeactivate = function (component, route, router) {
|
||||||
return component.canDeactivate();
|
return component.canDeactivate();
|
||||||
};
|
};
|
||||||
|
|
|
@ -1 +1,10 @@
|
||||||
{"version":3,"file":"edit-task.guard.js","sourceRoot":"","sources":["edit-task.guard.ts"],"names":[],"mappings":"OAAO,EAAE,UAAU,EAAE,MAAS,eAAe;AAM7C;IAAA;IAcA,CAAC;IAZC,qCAAa,GAAb,UAAc,SAA4B,EAC5B,KAA6B,EAC7B,MAA2B;QAEvC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IACI,wBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,UAAU,EAAE;KACnB,CAAC;IACF,kBAAkB;IACX,4BAAc,GAA6D,EACjF,CAAC;IACF,oBAAC;AAAD,CAAC,AAdD,IAcC"}
|
{
|
||||||
|
"version": 3,
|
||||||
|
"file": "edit-task.guard.js",
|
||||||
|
"sourceRoot": "",
|
||||||
|
"sources": [
|
||||||
|
"edit-task.guard.ts"
|
||||||
|
],
|
||||||
|
"names": [],
|
||||||
|
"mappings": "OAAO,EAAE,UAAU,EAAE,MAAS,eAAe;AAM7C;IAAA;IAcA,CAAC;IAZC,qCAAa,GAAb,UAAc,SAA4B,EAC5B,KAA6B,EAC7B,MAA2B;QAEvC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IACI,wBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,UAAU,EAAE;KACnB,CAAC;IACF,kBAAkB;IACX,4BAAc,GAA6D,EACjF,CAAC;IACF,oBAAC;AAAD,CAAC,AAdD,IAcC"
|
||||||
|
}
|
||||||
|
|
|
@ -8,8 +8,7 @@ export class EditTaskGuard implements CanDeactivate<EditTaskComponent>{
|
||||||
|
|
||||||
canDeactivate(component: EditTaskComponent,
|
canDeactivate(component: EditTaskComponent,
|
||||||
route: ActivatedRouteSnapshot,
|
route: ActivatedRouteSnapshot,
|
||||||
router: RouterStateSnapshot)
|
router: RouterStateSnapshot): Observable<boolean> | boolean {
|
||||||
: Observable<boolean> | boolean {
|
|
||||||
return component.canDeactivate();
|
return component.canDeactivate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,10 +14,12 @@ div.task-list-entry, a.task-list-entry {
|
||||||
span {
|
span {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
font-size: x-large;
|
font-size: x-large;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
small {
|
small {
|
||||||
color: grey;
|
color: grey;
|
||||||
}
|
}
|
||||||
|
@ -32,9 +34,32 @@ small {
|
||||||
background-color: aliceblue;
|
background-color: aliceblue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
@-webkit-keyframes fadeIn {
|
||||||
@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
from {
|
||||||
@keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@-moz-keyframes fadeIn {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.fade-in {
|
.fade-in {
|
||||||
opacity: 0; /* make things invisible upon start */
|
opacity: 0; /* make things invisible upon start */
|
||||||
|
|
|
@ -23,6 +23,7 @@ export class TaskItemComponent {
|
||||||
constructor(private router: Router) {
|
constructor(private router: Router) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
select() {
|
select() {
|
||||||
this.taskSelected.emit(this.task.id)
|
this.taskSelected.emit(this.task.id)
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<h4>Status</h4>
|
<h4>Status</h4>
|
||||||
<select class="form-control" name="state" [ngModel]="task.state" (ngModelChange)="task.state = $event; saveTask()" >
|
<select class="form-control" name="state" [ngModel]="task.state"
|
||||||
|
(ngModelChange)="task.state = $event; saveTask()">
|
||||||
<optgroup *ngFor="let group of model.stateGroups" [label]="group.label">
|
<optgroup *ngFor="let group of model.stateGroups" [label]="group.label">
|
||||||
<option *ngFor="let state of group.states" [value]="state">
|
<option *ngFor="let state of group.states" [value]="state">
|
||||||
{{model.stateTexts[state]}}
|
{{model.stateTexts[state]}}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
|
// return random string of given length, from:
|
||||||
// method to create random string of given length, from:
|
|
||||||
// http://stackoverflow.com/questions/16106701/how-to-generate-a-random-string-of-letters-and-numbers-in-javascript
|
// http://stackoverflow.com/questions/16106701/how-to-generate-a-random-string-of-letters-and-numbers-in-javascript
|
||||||
export function generateRandomString(len) {
|
export function generateRandomString(len) {
|
||||||
var text = "";
|
var text = "";
|
Loading…
Reference in New Issue