Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/matsen-tool-fe

# Conflicts:
#	matsen-tool/src/app/_views/documents/document-list/document-list.component.ts

matsen-tool/src/app/_components/list/list.component.ts

@@ -101,8 +101,9 @@ export class ListComponent implements OnInit, AfterViewInit {
     }
 
     onSortChange = (sortState: Sort) => {
-        this.pagingComponent.resetPageIndex()
+        this.pagingComponent.resetPageIndex();
         this.onSortFunction(sortState);
+        this.getData();
     }
 
     onRowSelected(row: any, index: number) {

matsen-tool/src/app/_views/documents/document-list/document-list.component.ts

@@ -114,8 +114,8 @@ export class DocumentListComponent implements OnInit, AfterViewInit {
         this.appHelperService.openModal(NewDocumentComponent, {'document': document}, this.listComponent.getData);
     }
 
-    openModalEditDocument(element: DocumentJsonld) {
-        this.appHelperService.openModal(NewDocumentComponent, {'document': element}, this.listComponent.getData);
+    openModalEditDocument = (element: DocumentJsonld) => {
+        this.appHelperService.openModal(NewDocumentComponent, { 'document': element }, this.listComponent.getData);
     }
 
 }

matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts

@@ -164,6 +164,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
     }
 
     onSortChange = (sortState: Sort) => {
+        console.log(sortState);
         let order: OrderFilter;
         if (sortState.direction === "") {
             order = OrderFilter.Undefined;
@@ -174,6 +175,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
         this.nameOrderAsc = OrderFilter.Undefined;
         this.cityOrderAsc = OrderFilter.Undefined;
         this.websiteOrderAsc = OrderFilter.Undefined;
+        console.log(order);
         switch (sortState.active) {
             case "name":
                 this.nameOrderAsc = order;
@@ -185,7 +187,7 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
                 this.websiteOrderAsc = order;
                 break;
         }
-        this.listComponent.getData();
+        //this.listComponent.getData();
     }
 
     navigateToPartnerDetails = (element: any) => {

matsen-tool/src/app/_views/user/user-detail/user-detail.component.ts

@@ -50,7 +50,6 @@ export class UserDetailComponent implements OnInit, AfterViewInit {
     }
 
     ngOnInit() {
-        console.log(this.user);
         if (this.user === undefined) {
             this.route.params.subscribe(params => {
                 this.getUserData(params['id']);