Merge branch 'master' of https://git-st.inf.tu-dresden.de/ipos/front-end-app

# Conflicts:
#	src/app/components/pick-list/pick-list.component.html

src/app/app.component.html

@@ -14,13 +14,3 @@
     </mat-tab>
     
 </mat-tab-group>
-
-
-
-
-
-
-
-
-
-

src/app/components/pick-list/pick-list.component.html

@@ -36,36 +36,36 @@
             <th mat-header-cell *matHeaderCellDef> Inventory Ist </th>
             <td mat-cell *matCellDef="let item"> 
                 <mat-chip-list *ngIf="item.inventoryItemIst">
-                    <mat-basic-chip selected [style]="item.inventoryIsCorrect === true ? 'background-color:green; color:white' : 'background-color:red; color:white'">
+                    <mat-chip selected [color]="item.inventoryIsCorrect === true ? 'accent' : 'warn'">
                         {{item.inventoryItemIst}} 
-                    </mat-basic-chip>
+                    </mat-chip>
                 </mat-chip-list>
             </td>
         </ng-container>
 
-        <!-- Shipment Ist-->
-        <ng-container matColumnDef="shipment_ist">
+        <!-- Shipment Soll-->
+        <ng-container matColumnDef="shipment_soll">
             <th mat-header-cell *matHeaderCellDef>
-                Shipment Ist
+                Shipment Soll
             </th>
             <td mat-cell *matCellDef="let item">
-                <mat-chip-list *ngIf="item.shipmentBinNrIst">
-                    <mat-basic-chip selected [style]="item.shipmentIsCorrect === true ? 'background-color:green; color:white' : 'background-color:red; color:white'">
-                        {{item.shipmentBinNrIst}} 
-                    </mat-basic-chip>
+                <mat-chip-list *ngIf="item.shipmentBinNrSoll">
+                    <mat-chip selected>
+                        {{item.shipmentBinNrSoll}} 
+                    </mat-chip>
                 </mat-chip-list>
             </td>
         </ng-container>
 
-        <!-- Shipment Soll-->
-        <ng-container matColumnDef="shipment_soll">
+        <!-- Shipment Ist-->
+        <ng-container matColumnDef="shipment_ist">
             <th mat-header-cell *matHeaderCellDef>
-                Shipment Soll
+                Shipment Ist
             </th>
             <td mat-cell *matCellDef="let item"> 
-                <mat-chip-list *ngIf="item.shipmentBinNrSoll">
-                    <mat-chip selected>
-                        {{item.shipmentBinNrSoll}} 
+                <mat-chip-list *ngIf="item.shipmentBinNrIst">
+                    <mat-chip selected [color]="item.shipmentIsCorrect === true ? 'accent' : 'warn'">
+                        {{item.shipmentBinNrIst}} 
                     </mat-chip>
                 </mat-chip-list>
             </td>