Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mauritz, Falk Marius
SWTII Cal
Commits
d6c11c16
Commit
d6c11c16
authored
Jun 11, 2019
by
HellLab
Browse files
Merge remote-tracking branch 'origin/AqueductBranch' into AqueductBranch
parents
829a6fb5
7966acf6
Pipeline
#6485
passed with stage
in 4 minutes and 44 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend/lib/src/view/components/appointment_new_component.dart
View file @
d6c11c16
...
...
@@ -21,7 +21,6 @@ class AppointmentNewComponent implements OnActivate {
AppointmentNewComponent
(
this
.
_appointmentService
,
this
.
_location
,
this
.
_router
);
//Später löschen
Appointment
appointment
=
Appointment
.
zero
();
final
Location
_location
;
final
AppointmentService
_appointmentService
;
...
...
frontend/lib/src/view/components/contact_list_component.css
View file @
d6c11c16
...
...
@@ -53,7 +53,7 @@ table tr{
cursor
:
default
;
}
#
con
{
#
delete
{
color
:
red
;
}
frontend/lib/src/view/components/login_component.dart
View file @
d6c11c16
import
'package:angular/angular.dart'
;
import
'package:angular_forms/angular_forms.dart'
;
import
'package:angular_router/angular_router.dart'
;
import
'package:demo/src/view/components/mock_users.dart'
;
import
'package:demo/src/view/services/person_service.dart'
;
import
'../../model/person.dart'
;
...
...
frontend/lib/src/view/components/mock_users.dart
deleted
100644 → 0
View file @
829a6fb5
import
'package:demo/src/model/person.dart'
;
///Mock Termine
final
mockUsers
=
<
User
>[
User
(-
1
,
'CC1'
,
"Admin"
,
"Ad"
,
"Min"
,
"admin@mock.com"
,
"mockAdmin1"
,
""
),
User
(-
2
,
'CC2'
,
"User"
,
"Us"
,
"Er"
,
"user@mock.com"
,
"mockUser1"
,
""
)
];
\ No newline at end of file
frontend/lib/src/view/components/register_component.dart
View file @
d6c11c16
...
...
@@ -2,7 +2,6 @@ import 'package:angular/angular.dart';
import
'package:angular_forms/angular_forms.dart'
;
import
'package:angular_router/angular_router.dart'
;
import
'package:demo/src/view/components/login_component.dart'
;
import
'package:demo/src/view/components/mock_users.dart'
;
import
'package:demo/src/view/services/person_service.dart'
;
import
'../../model/person.dart'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment