Merge pull request #18 from NSTMS/frontend-development

Frontend development

Author: NSTMS

wms-praktyki-yosi-frontend/src/app/Components/document-pages/add-document/add-document.component.ts

@@ -35,8 +35,8 @@ export class AddDocumentComponent {
         id: ++this.counter
       }
     )
-    
   }
+  
   handleDeleteItem(id : number){
     this.data.itemList =this.data.itemList.filter(i => i.id !== id)
   }

wms-praktyki-yosi-frontend/src/app/Components/document-pages/dialogs/putback-dialog/putback-dialog.component.html

@@ -0,0 +1,19 @@
+<h1 mat-dialog-title>Put back product</h1>
+<div mat-dialog-content>
+    <mat-form-field appearance="fill" floatLabel="always">
+        <mat-label>Quantity planned</mat-label>
+        <input matInput type="number" class="example-right-align" min="0" placeholder=data.quantityPlaned [(ngModel)]="data.quantityDone">
+    </mat-form-field>
+    <mat-form-field appearance="fill">
+        <mat-label>Position</mat-label>
+        <input matInput class="example-right-align" placeholder="A1/B" [(ngModel)]="data.position">
+    </mat-form-field>
+    <mat-form-field appearance="fill">
+        <mat-label>Tag</mat-label>
+        <input matInput [(ngModel)]="data.tag">
+      </mat-form-field>
+</div>
+<div mat-dialog-actions>
+    <button mat-button mat-raised-button (click)="onNoClick()" color="primary">close</button>
+    <button mat-button mat-raised-button [mat-dialog-close]="data" cdkFocusInitial color="accent">sumbit</button>
+</div>

…it-document/edit-document.component.scss …ack-dialog/putback-dialog.component.scsswms-praktyki-yosi-frontend/src/app/Components/document-pages/edit-document/edit-document.component.scss renamed to wms-praktyki-yosi-frontend/src/app/Components/document-pages/dialogs/putback-dialog/putback-dialog.component.scss wms-praktyki-yosi-frontend/src/app/Components/document-pages/edit-document/edit-document.component.scss renamed to wms-praktyki-yosi-frontend/src/app/Components/document-pages/dialogs/putback-dialog/putback-dialog.component.scss

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PutbackDialogComponent } from './putback-dialog.component';
+
+describe('PutbackDialogComponent', () => {
+  let component: PutbackDialogComponent;
+  let fixture: ComponentFixture<PutbackDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PutbackDialogComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PutbackDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

wms-praktyki-yosi-frontend/src/app/Components/document-pages/dialogs/putback-dialog/putback-dialog.component.spec.ts

@@ -0,0 +1,23 @@
+import { Component,Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { documentItem } from '@static/types/documentTypes';
+
+@Component({
+  selector: 'app-putback-dialog',
+  templateUrl: './putback-dialog.component.html',
+  styleUrls: ['./putback-dialog.component.scss']
+})
+export class PutbackDialogComponent {
+  constructor(
+    public dialogRef: MatDialogRef<PutbackDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: documentItem,
+  ) {
+    console.log(this.data);
+    
+  }
+
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+  
+}

wms-praktyki-yosi-frontend/src/app/Components/document-pages/dialogs/putback-dialog/putback-dialog.component.ts

@@ -104,6 +104,14 @@
       </button>
     </mat-cell>
   </ng-container>
+  <ng-container matColumnDef="putback" *ngIf="canAddAndDel">
+    <mat-header-cell *matHeaderCellDef></mat-header-cell>
+    <mat-cell *matCellDef="let document"
+      ><button mat-flat-button color="warn" (click)="handlePutBack(document.id)">
+        put back
+      </button>
+    </mat-cell>
+  </ng-container>
   <ng-container matColumnDef="edit" *ngIf="canAddAndDel">
     <mat-header-cell *matHeaderCellDef></mat-header-cell>
     <mat-cell *matCellDef="let document"

wms-praktyki-yosi-frontend/src/app/Components/document-pages/edit-document/edit-document.component.html

@@ -3,13 +3,12 @@ import { MatPaginator } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DocumentsService } from '@app/Services/fetching-services/documents.service';
-import { detailedDocument, documentItem,EditDialogData, ItemToSend, visitedElement } from '@static/types/documentTypes';
-import {
-  MatDialog,
-} from '@angular/material/dialog';
+import { detailedDocument, documentItem,EditDialogData} from '@static/types/documentTypes';
+import {MatDialog} from '@angular/material/dialog';
 import { EditDialogComponent } from '../dialogs/edit-dialog/edit-dialog.component';
 import { VisitDialogComponent } from '../dialogs/visit-dialog/visit-dialog.component';
 import { AddDialogComponent } from '../dialogs/add-dialog/add-dialog.component';
+import { PutbackDialogComponent } from '../dialogs/putback-dialog/putback-dialog.component';
 
 @Component({
   selector: 'app-info-document',
@@ -54,7 +53,7 @@ export class InfoDocumentComponent {
     this.canAddAndDel = localStorage.getItem('role') != 'User';
 
     if (this.canAddAndDel)
-      this.displayedColumns = [...this.columns, 'visit', 'edit', 'delete'];
+      this.displayedColumns = [...this.columns, 'visit','putback', 'edit', 'delete'];
     else this.displayedColumns = [...this.columns];
   }
 
@@ -117,6 +116,10 @@ export class InfoDocumentComponent {
         }
       }
     })
+    dialogRef.backdropClick().subscribe(()  =>{
+      window.location.reload()
+    })
+    
   }
 
   handleVisit(guid: string)  {
@@ -138,12 +141,36 @@ export class InfoDocumentComponent {
             quantity : result.quantityDone,
             tag : result.tag
           }
-          console.log(result);
-          
+    
           await this._service.VisitLocation(this.id, res);
           window.location.reload()
         }
       })
     });
   }
+  handlePutBack(guid: string){
+    const dialogData = this.data.items.filter(d=> d.id == guid)[0] as documentItem
+    const dialogRef = this.dialog.open(PutbackDialogComponent, {
+      data: {...dialogData}
+    })
+    dialogRef.backdropClick().subscribe(()  =>{
+      window.location.reload()
+    })
+    dialogRef.afterClosed().subscribe(result=> {     
+      this.data.items.map(async v =>{      
+        if(v.id == guid)
+        {
+          const res = 
+          {
+            productName : result.productName,
+            position : result.position,
+            quantity : result.quantityDone,
+            tag : result.tag
+          }          
+          await this._service.PutBackToLocation(this.id, res);
+          window.location.reload()
+        }
+      })
+    });
+  }
 }