Commit 2faeeaaa authored 4 years ago by Kruyff,D.L.W. (Dylan)

Merge mts to master

Former-commit-id: 58b61c74

parents 27069a31 d649a93c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

AngularApp/prototype/src/app/api.service.ts 68 additions, 23 deletions

AngularApp/prototype/src/app/api.service.ts
AngularApp/prototype/src/app/app.module.ts 2 additions, 0 deletions

AngularApp/prototype/src/app/app.module.ts
AngularApp/prototype/src/app/labeling-window/labeling-window.component.css 2 additions, 1 deletion

...ype/src/app/labeling-window/labeling-window.component.css
AngularApp/prototype/src/app/labeling-window/labeling-window.component.html 1 addition, 5 deletions

...pe/src/app/labeling-window/labeling-window.component.html
AngularApp/prototype/src/app/labeling-window/labeling-window.component.ts 69 additions, 58 deletions

...type/src/app/labeling-window/labeling-window.component.ts
AngularApp/prototype/src/app/labels/labels.component.ts 1 addition, 1 deletion

AngularApp/prototype/src/app/labels/labels.component.ts
AngularApp/prototype/src/app/main/main.component.html 1 addition, 2 deletions

AngularApp/prototype/src/app/main/main.component.html
AngularApp/prototype/src/app/overview-window/overview-window.component.html 1 addition, 1 deletion

...pe/src/app/overview-window/overview-window.component.html
AngularApp/prototype/src/app/overview-window/overview-window.component.ts 150 additions, 61 deletions

...type/src/app/overview-window/overview-window.component.ts
AngularApp/prototype/src/app/progress-view/progress-view.component.css 9 additions, 0 deletions

...ototype/src/app/progress-view/progress-view.component.css
AngularApp/prototype/src/app/progress-view/progress-view.component.html 9 additions, 2 deletions

...totype/src/app/progress-view/progress-view.component.html
AngularApp/prototype/src/app/progress-view/progress-view.component.ts 114 additions, 118 deletions

...rototype/src/app/progress-view/progress-view.component.ts
AngularApp/prototype/src/app/query-window/query-window.component.ts 51 additions, 45 deletions

.../prototype/src/app/query-window/query-window.component.ts
AngularApp/prototype/src/app/state.service.ts 74 additions, 61 deletions

AngularApp/prototype/src/app/state.service.ts
AngularApp/prototype/src/app/table-overview/table-overview.component.css 12 additions, 0 deletions

...otype/src/app/table-overview/table-overview.component.css
AngularApp/prototype/src/app/table-overview/table-overview.component.html 5 additions, 4 deletions

...type/src/app/table-overview/table-overview.component.html
AngularApp/prototype/src/app/table-overview/table-overview.component.ts 157 additions, 83 deletions

...totype/src/app/table-overview/table-overview.component.ts
AngularApp/prototype/src/app/training-window/training-window.component.css 0 additions, 0 deletions

...ype/src/app/training-window/training-window.component.css
AngularApp/prototype/src/app/training-window/training-window.component.html 5 additions, 0 deletions

...pe/src/app/training-window/training-window.component.html
AngularApp/prototype/src/app/training-window/training-window.component.ts 35 additions, 0 deletions

...type/src/app/training-window/training-window.component.ts

with 766 additions and 465 deletions

Please register or to comment