edit search box

matsen-tool/src/app/_components/search-input/search-input.component.ts

@@ -34,6 +34,5 @@ export class SearchInputComponent {
 
     protected onItemSelect(selectedItem: any): void {
         this.documentForm.get(this.formId)?.setValue(selectedItem.item.id);
-        console.log(this.documentForm);
     }
 }

matsen-tool/src/app/_components/search-select/search-select.component.ts

@@ -19,6 +19,7 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
     @Input() public getDataFunction!: Function;
     @Input() public dataSource: any;
     @Input() public searchSelectColDefs!: SearchInputColDef[];
+    @Input() public dataSet!: any;
     @Input() public displayedDataField!: string;
     @Input() public displayedDataSubResource!: string;
 
@@ -51,6 +52,9 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
     }
 
     ngOnInit(): void {
+        if (this.dataSet !== undefined) {
+            this.searchBoxFilled = true;
+        }
         this.displayedColumns = [];
         this.searchSelectColDefs.forEach((value, index) => {
             this.displayedColumns.push(value.column);
@@ -58,7 +62,9 @@ export class SearchSelectComponent implements OnInit, AfterViewInit {
     }
 
     ngAfterViewInit(): void {
-      //  this.searchBoxOpen = false;
+        if (this.dataSet !== undefined) {
+            this.paragraphRef.nativeElement.textContent =  this.dataSet[this.displayedDataField];
+        }
     }
 
     getData(): void {

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

@@ -74,7 +74,6 @@ export class ContactsDetailComponent implements OnInit, AfterViewInit {
                 this.contact = data;
                 this.getPartnerData();
                 this.getContactProducts();
-
             }
         );
     }

matsen-tool/src/app/_views/contacts/new-contact/new-contact.component.ts

@@ -42,7 +42,6 @@ export class NewContactComponent implements OnInit, AfterViewInit {
     }
 
     ngOnInit(): void {
-        console.log(this.contact);
         this.contactForm = FormGroupInitializer.initFormGroup(this.contactForm, this.contact);
     }
 

matsen-tool/src/app/_views/documents/new-document/new-document.component.html

@@ -14,13 +14,14 @@
 
         <div class="mb-3">
             <app-search-select #partnerSearchSelect
-                              [formId]="'partnerIri'"
-                              [formLabelLangKey]="'form.partner'"
-                              [documentForm]="documentForm"
-                              [getDataFunction]="getPartners"
-                              [dataSource]="dataSourcePartners"
-                              [searchSelectColDefs]="colDefPartners"
-                              [displayedDataField]="'name'"
+                               [formId]="'partnerIri'"
+                               [formLabelLangKey]="'form.partner'"
+                               [documentForm]="documentForm"
+                               [getDataFunction]="getPartners"
+                               [dataSource]="dataSourcePartners"
+                               [searchSelectColDefs]="colDefPartners"
+                               [displayedDataField]="'name'"
+                               [dataSet]="document.partner"
             >
             </app-search-select>
             <input type="hidden" formControlName="partner"/>
@@ -28,13 +29,14 @@
 
         <div class="mb-3">
             <app-search-select #productSearchSelect
-                              [formId]="'productIri'"
-                              [formLabelLangKey]="'form.product'"
-                              [documentForm]="documentForm"
-                              [getDataFunction]="getProducts"
-                              [dataSource]="dataSourceProducts"
-                              [searchSelectColDefs]="colDefProducts"
-                              [displayedDataField]="'name'"
+                               [formId]="'productIri'"
+                               [formLabelLangKey]="'form.product'"
+                               [documentForm]="documentForm"
+                               [getDataFunction]="getProducts"
+                               [dataSource]="dataSourceProducts"
+                               [searchSelectColDefs]="colDefProducts"
+                               [displayedDataField]="'name'"
+                               [dataSet]="document.product"
             >
             </app-search-select>
             <input type="hidden" formControlName="product"/>

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

@@ -107,7 +107,6 @@ export class NewDocumentComponent implements OnInit, AfterViewInit  {
     }
 
     onSubmit() {
-        console.log(this.documentForm);
         if (this.selectedFile !== null) {
             this.documentObjectSub = this.documentObjectService.documentObjectsPost(
                 this.selectedFile

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

@@ -235,7 +235,6 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
     }
 
     unassignPartner = (element: any)=> {
-        console.log(element);
         let confirmMessage = "";
         this.translateService.get('system.confirm-unassign').subscribe((translation: string) => {
             confirmMessage = translation;

matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html

@@ -20,6 +20,7 @@
                                [dataSource]="dataSourceContacts"
                                [searchSelectColDefs]="colDefContacts"
                                [displayedDataField]="'fullName'"
+                               [dataSet]="taskNote.contact"
             >
             </app-search-select>
             <input type="hidden" formControlName="contactIri" value="{{taskNote.contactIri}}"/>

matsen-tool/src/app/_views/tasks/new-task/new-task.component.html

@@ -20,30 +20,32 @@
 
         <div class="mb-3">
             <label for="productIri" class="form-label">{{ 'form.product' | translate }}:</label>
-                <app-search-select #productSearchSelect id="productIri"
-                   [formId]="'productIri'"
-                   [formLabelLangKey]="'form.product'"
-                   [documentForm]="taskForm"
-                   [getDataFunction]="getProducts"
-                   [dataSource]="dataSourceProducts"
-                   [searchSelectColDefs]="colDefProducts"
-                   [displayedDataField]="'name'"
-                >
-                    <input type="hidden" formControlName="productIri" value="{{task.productIri}}"/>
-                </app-search-select>
+            <app-search-select #productSearchSelect id="productIri"
+                               [formId]="'productIri'"
+                               [formLabelLangKey]="'form.product'"
+                               [documentForm]="taskForm"
+                               [getDataFunction]="getProducts"
+                               [dataSource]="dataSourceProducts"
+                               [searchSelectColDefs]="colDefProducts"
+                               [displayedDataField]="'name'"
+                               [dataSet]="task.product"
+            >
+                <input type="hidden" formControlName="productIri" value="{{task.productIri}}"/>
+            </app-search-select>
         </div>
 
 
         <div class="mb-3">
             <label for="assignedToIri" class="form-label">{{ 'form.assign-to' | translate }}:</label>
             <app-search-select #userSearchSelect id="assignedToIri"
-               [formId]="'assignedToIri'"
-               [formLabelLangKey]="'form.user'"
-               [documentForm]="taskForm"
-               [getDataFunction]="getUsers"
-               [dataSource]="dataSourceUsers"
-               [searchSelectColDefs]="colDefUsers"
-               [displayedDataField]="'fullName'"
+                               [formId]="'assignedToIri'"
+                               [formLabelLangKey]="'form.user'"
+                               [documentForm]="taskForm"
+                               [getDataFunction]="getUsers"
+                               [dataSource]="dataSourceUsers"
+                               [searchSelectColDefs]="colDefUsers"
+                               [displayedDataField]="'fullName'"
+                               [dataSet]="task.assignedTo"
             >
                 <input type="hidden" formControlName="assignedToIri" value="{{task.productIri}}"/>
             </app-search-select>
@@ -63,15 +65,16 @@
 
         <div class="d-flex mb-3">
             <div class="form-check me-3">
-                <input type="radio" class="form-check-input" id="radio-prio-low" formControlName="prio" value="low" />
+                <input type="radio" class="form-check-input" id="radio-prio-low" formControlName="prio" value="low"/>
                 <label for="radio-prio-low" class="form-check-label">{{ 'form.prio-low' | translate }}</label>
             </div>
             <div class="form-check me-3">
-                <input type="radio" class="form-check-input" id="radio-prio-medium" formControlName="prio" value="medium" />
+                <input type="radio" class="form-check-input" id="radio-prio-medium" formControlName="prio"
+                       value="medium"/>
                 <label for="radio-prio-medium" class="form-check-label">{{ 'form.prio-medium' | translate }}</label>
             </div>
             <div class="form-check me-3">
-                <input type="radio" class="form-check-input" id="radio-prio-high" formControlName="prio" value="high" />
+                <input type="radio" class="form-check-input" id="radio-prio-high" formControlName="prio" value="high"/>
                 <label for="radio-prio-high" class="form-check-label">{{ 'form.prio-high' | translate }}</label>
             </div>
         </div>

matsen-tool/src/app/_views/tasks/new-task/new-task.component.ts

@@ -161,8 +161,6 @@ export class NewTaskComponent implements OnInit, AfterViewInit {
         // Set T12:00 for correct string
         let selectedItemValue = selectedItem.target.value + "T12:00";
         this.taskForm.get('dueAt')?.setValue(selectedItemValue);
-        console.log(this.taskForm);
-        console.log(this.taskForm.value);
     }
 
     protected onSubmit() {

matsen-tool/src/app/_views/tasks/task-list/task-list.component.html

@@ -52,7 +52,7 @@
                                 <div class="col-12 col-md-8">
                                     <p class="m-0 mb-3 mt-2"
                                        [innerHTML]="appHelperService.getSafeLongtext(task.description)"></p>
-                                    <span *ngIf="task.createdBy === currentUser?.id" class="position-absolute bi bi-pencil p-2"
+                                    <span *ngIf="task.createdBy?.id === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                           data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
                                     <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">
                                         <span *ngIf="task.numTaskNotes !== undefined && task.numTaskNotes !== null && task.numTaskNotes > 0"
@@ -88,7 +88,7 @@
                                     <span class="importance" [attr.data-importance]="task.prio"></span>
                                     <h2 class="m-0">{{ task.headline }}</h2>
                                     <p class="m-0" [innerHTML]="appHelperService.getSafeLongtext(task.description)"></p>
-                                    <span *ngIf="task.createdBy === currentUser?.id" class="position-absolute bi bi-pencil p-2"
+                                    <span *ngIf="task.createdBy?.id === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                           data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
                                     <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">
                                         <span *ngIf="task.numTaskNotes !== undefined && task.numTaskNotes !== null && task.numTaskNotes > 0"
@@ -123,7 +123,7 @@
                                     <div>
                                         <p [innerHTML]="appHelperService.getSafeLongtext(taskNote.message)"></p>
                                     </div>
-                                    <span *ngIf="taskNote.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"
+                                    <span *ngIf="taskNote.owner?.id === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                           data-type="user-tool" data-action="edit"
                                           (click)="openModalEditTaskNote(taskNote, task)"></span>
                                 </div>

matsen-tool/src/app/_views/tasks/task-list/task-list.component.ts

@@ -160,7 +160,7 @@ export class TaskListComponent implements OnInit, AfterViewInit {
 
     openModalEditTaskNote(taskNote: TaskNoteJsonld, task: TaskJsonld) {
         this.appHelperService.openModal(
-            NewTaskNoteComponent, { 'taskNote': taskNote, 'task': task  }, this.afterCommentCreation, taskNote.id
+            NewTaskNoteComponent, { 'taskNote': taskNote, 'task': task  }, this.afterCommentCreation, task.id
         );
     }
 

matsen-tool/src/assets/scss/_basics.scss

@@ -394,6 +394,9 @@ img {
   }
   .search-toggle {
     display: none;
+    td {
+      cursor: pointer;
+    }
   }
   .search-box-open {
     display: block;