Commit d99620c9 authored by Abuhujair Javed's avatar Abuhujair Javed

Dialog Box Updated

parent fd6dee8c
...@@ -28,8 +28,8 @@ import { MatStepperModule } from '@angular/material/stepper'; ...@@ -28,8 +28,8 @@ import { MatStepperModule } from '@angular/material/stepper';
import { MatListModule } from '@angular/material/list'; import { MatListModule } from '@angular/material/list';
import { MatExpansionModule} from '@angular/material/expansion'; import { MatExpansionModule} from '@angular/material/expansion';
//import { MatDialog, MatDialogRef } from '@angular/material/dialog'; //import { MatDialog, MatDialogRef } from '@angular/material/dialog';
//import { CreateTicketDialog } from './jira/jira.component'; import { MatDialogModule } from '@angular/material/dialog';
import { MatDialogModule } from '@angular/material/dialog' import { CreateTicketDialog } from './jira/jira.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -42,6 +42,7 @@ import { MatDialogModule } from '@angular/material/dialog' ...@@ -42,6 +42,7 @@ import { MatDialogModule } from '@angular/material/dialog'
JiraComponent, JiraComponent,
ConfluenceComponent, ConfluenceComponent,
ProjectComponent, ProjectComponent,
CreateTicketDialog
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
...@@ -62,10 +63,9 @@ import { MatDialogModule } from '@angular/material/dialog' ...@@ -62,10 +63,9 @@ import { MatDialogModule } from '@angular/material/dialog'
MatStepperModule, MatStepperModule,
MatListModule, MatListModule,
MatExpansionModule, MatExpansionModule,
MatDialogModule MatDialogModule,
//MatDialog, //MatDialog,
//MatDialogRef, //MatDialogRef,
//CreateTicketDialog
], ],
providers: [CookieService], providers: [CookieService],
bootstrap: [AppComponent] bootstrap: [AppComponent]
......
<!--
<h1 mat-dialog-title>Delete file</h1> <h1 mat-dialog-title>Delete file</h1>
<div mat-dialog-content> <div mat-dialog-content>
Would you like to delete cat.jpeg? Would you like to delete cat.jpeg?
...@@ -6,3 +7,24 @@ ...@@ -6,3 +7,24 @@
<button mat-button mat-dialog-close>No</button> <button mat-button mat-dialog-close>No</button>
<button mat-button mat-dialog-close cdkFocusInitial>Ok</button> <button mat-button mat-dialog-close cdkFocusInitial>Ok</button>
</div> </div>
-->
<div class="dialog-box-css">
<h1 mat-dialog-title>Create ticket on {{data.pname}}</h1>
<div mat-dialog-content>
<p>Enter ticket details</p>
<mat-form-field appearance="fill">
<mat-label>Ticket Name</mat-label>
<input matInput [(ngModel)]="data.tname">
</mat-form-field>
<mat-form-field appearance="fill">
<mat-label>Ticket Content</mat-label>
<input matInput [(ngModel)]="data.tcontent">
</mat-form-field>
</div>
<div mat-dialog-actions>
<button mat-button (click)="onNoClick()">Cancel</button>
<button mat-button [mat-dialog-close]="data" cdkFocusInitial>Ok</button>
</div>
</div>
\ No newline at end of file
...@@ -26,3 +26,8 @@ ...@@ -26,3 +26,8 @@
right: 0px; right: 0px;
bottom: 20px; bottom: 20px;
} }
.dialog-box-css {
width: 450px;
height: 300px;
}
\ No newline at end of file
import { DialogRef } from '@angular/cdk/dialog'; import { DialogRef } from '@angular/cdk/dialog';
import { Component, OnInit } from '@angular/core'; import { Component, Inject, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { FetcherService } from '../fetcher.service'; import { FetcherService } from '../fetcher.service';
export interface TicketData {
tid: string;
pname:string;
tname: string;
tcontent: string;
}
@Component({ @Component({
selector: 'app-jira', selector: 'app-jira',
...@@ -13,6 +19,9 @@ import { FetcherService } from '../fetcher.service'; ...@@ -13,6 +19,9 @@ import { FetcherService } from '../fetcher.service';
export class JiraComponent implements OnInit { export class JiraComponent implements OnInit {
id: number; id: number;
name: string; name: string;
temp_tname = '';
temp_tcontent = '';
temp_tid = '';
constructor(public dialog:MatDialog, private fetcherService: FetcherService) { constructor(public dialog:MatDialog, private fetcherService: FetcherService) {
console.log(window.history.state); console.log(window.history.state);
this.id = window.history.state.id; this.id = window.history.state.id;
...@@ -30,9 +39,13 @@ export class JiraComponent implements OnInit { ...@@ -30,9 +39,13 @@ export class JiraComponent implements OnInit {
} }
openDialog(){ openDialog(){
const dialogRef = this.dialog.open(CreateTicketDialog); const dialogRef = this.dialog.open(CreateTicketDialog, {
data: {tid: this.temp_tid, pname:this.name, tname: this.temp_tname, tcontent: this.temp_tcontent,
},
});
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
console.log(`Dialog result: ${result}`); console.log('Dialog result:', result.tname, result.tcontent);
}); });
} }
...@@ -57,8 +70,8 @@ export class JiraComponent implements OnInit { ...@@ -57,8 +70,8 @@ export class JiraComponent implements OnInit {
else{ else{
return BACKLOG; return BACKLOG;
} }
}
}
moveToInProgress(tid: number){ moveToInProgress(tid: number){
console.log(tid); console.log(tid);
console.log('Move to In Progress'); console.log('Move to In Progress');
...@@ -87,8 +100,18 @@ export class JiraComponent implements OnInit { ...@@ -87,8 +100,18 @@ export class JiraComponent implements OnInit {
@Component({ @Component({
selector: 'create-ticket-dialog', selector: 'create-ticket-dialog',
templateUrl: './create-ticket-dialog.html', templateUrl: './create-ticket-dialog.html',
styleUrls: ['./jira.component.css']
}) })
export class CreateTicketDialog {} export class CreateTicketDialog {
constructor(
public dialogRef: MatDialogRef<CreateTicketDialog>,
@Inject(MAT_DIALOG_DATA) public data:TicketData,
){}
onNoClick(){
this.dialogRef.close();
}
}
export const GRID_NAME = [ export const GRID_NAME = [
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<button class="flex-item" mat-raised-button color="primary" [routerLink]="['/home']" (click)="login()"> <button class="flex-item" mat-raised-button color="primary" [routerLink]="['/home']" (click)="login()">
Login Login
</button> </button>
<button class="flex-item" mat-raised-button color="primary" (click)="register()"> <button class="flex-item" mat-raised-button color="primary" [routerLink]="['/home']" (click)="register()">
Register here Register here
</button> </button>
</div> </div>
...@@ -30,9 +30,11 @@ export class LoginComponent implements OnInit { ...@@ -30,9 +30,11 @@ export class LoginComponent implements OnInit {
console.log('gotoRegister'); console.log('gotoRegister');
} }
register(){ register(){
console.log(this.email.value);
console.log(this.password.value);
this.setCookie('email',String(this.email.value)); this.setCookie('email',String(this.email.value));
this.setCookie('password',String(this.password.value)); this.setCookie('password',String(this.password.value));
console.log(this.email.value); this.setCookie('login','true');
} }
setCookie(name: string,value: string){ setCookie(name: string,value: string){
this.cookieService.set(name,value); this.cookieService.set(name,value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment