Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Tabu
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
9
Issues
9
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dennis Willers
Tabu
Commits
63fcd89b
Commit
63fcd89b
authored
Apr 16, 2021
by
redisa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dialog geht nicht zu
parent
c03bc8ec
Pipeline
#402
passed with stage
in 5 minutes and 11 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
1 deletion
+21
-1
app.module.ts
src/app/app.module.ts
+2
-0
overview.component.html
src/app/overview/overview.component.html
+1
-0
overview.component.ts
src/app/overview/overview.component.ts
+12
-1
testdialog.html
src/app/overview/testdialog.html
+6
-0
No files found.
src/app/app.module.ts
View file @
63fcd89b
...
...
@@ -31,6 +31,7 @@ import { RoundHistoryComponent } from './round-history/round-history.component';
import
{
MatTableModule
}
from
'
@angular/material/table
'
;
import
{
MatTreeModule
}
from
'
@angular/material/tree
'
;
import
{
ViewModus
}
from
'
./dao/viewModus
'
;
import
{
MatDialogModule
}
from
'
@angular/material/dialog
'
;
@
NgModule
({
declarations
:
[
...
...
@@ -64,6 +65,7 @@ import {ViewModus} from './dao/viewModus';
MatTooltipModule
,
MatTableModule
,
MatTreeModule
,
MatDialogModule
],
providers
:
[
IsAllowedToPlay
,
...
...
src/app/overview/overview.component.html
View file @
63fcd89b
...
...
@@ -69,6 +69,7 @@
<mat-card-title
*ngIf=
"!isActiveRound"
>
{{nextTeam}} ist am Zug:
</mat-card-title>
<br>
<button
[disabled]=
"buttonNextRoundDisabled || gameStatus.activeExplainer == 1"
mat-raised-button
color=
"primary"
(click)=
"nextRound()"
>
Ich erkläre und los!
</button>
<button
mat-button
(click)=
"openDialog()"
>
Launch dialog
</button>
</mat-card-actions>
</mat-card>
</div>
...
...
src/app/overview/overview.component.ts
View file @
63fcd89b
...
...
@@ -8,6 +8,7 @@ import {Subject} from 'rxjs';
import
{
takeUntil
}
from
'
rxjs/operators
'
;
import
{
ViewModus
}
from
'
../dao/viewModus
'
;
import
{
Location
}
from
'
@angular/common
'
;
import
{
MatDialog
}
from
'
@angular/material/dialog
'
;
@
Component
({
selector
:
'
app-overview
'
,
...
...
@@ -54,7 +55,8 @@ export class OverviewComponent implements OnInit, OnDestroy {
private
service
:
TabuMiddlewareService
,
private
isAllowedToPlay
:
IsAllowedToPlay
,
private
socketDataService
:
SocketDataService
,
private
screen
:
ViewModus
)
{
private
screen
:
ViewModus
,
public
dialog
:
MatDialog
)
{
screen
.
$view
.
subscribe
(
view
=>
{
this
.
view
=
view
;
...
...
@@ -252,6 +254,10 @@ export class OverviewComponent implements OnInit, OnDestroy {
}
}
openDialog
()
{
this
.
dialog
.
open
(
TestDialogComponent
);
}
@
HostListener
(
'
window:scroll
'
,
[
'
$event
'
])
onWindowScroll
(
$event
:
any
):
void
{
const
numb
=
window
.
scrollY
;
...
...
@@ -274,3 +280,8 @@ export class OverviewComponent implements OnInit, OnDestroy {
this
.
ngUnsubscribe
.
complete
();
}
}
@
Component
({
selector
:
'
testdialog
'
,
templateUrl
:
'
./testdialog.html
'
,
})
export
class
TestDialogComponent
{}
\ No newline at end of file
src/app/overview/testdialog.html
0 → 100644
View file @
63fcd89b
<h1
mat-dialog-title
>
Ihr habt alle Begriffe durchgespielt!
</h1>
<div
mat-dialog-content
>
Eröffnet einen neuen Raum oder setzt den Fortschritt sofort hier zurück:
</div>
<div
mat-dialog-actions
>
<button
mat-button
mat-dialog-close
>
Zurücksetzen
</button>
<button
mat-button
>
Schließen
</button>
</div>
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