Added simple mutations to make report work

Author: Gid733

eFormAPI/eFormAPI.Web/Services/EformReportsService.cs

@@ -151,9 +151,16 @@ private static List<EformReportDataItemModel> GetReportDataItemList(BaseDbContex
 
                     dbContext.EformReportDataItems.Add(eformReportDataItem);
                     dbContext.SaveChanges();
+
+                    eformReportDataItem = dbContext.EformReportDataItems
+                        .Include(x => x.NestedDataItems)
+                        .ThenInclude(x => x.NestedDataItems)
+                        .FirstOrDefault(x => x.Id == eformReportDataItem.Id);
+
+                    parentItems.Add(eformReportDataItem);
                 }
 
-                parentItems.Add(eformReportDataItem);
+        
             }
 
             var result = new List<EformReportDataItemModel>();
@@ -306,6 +313,15 @@ public async Task<OperationDataResult<EformReportFullModel>> GetEformReport(int
                         };
                         _dbContext.EformReportElements.Add(reportElement);
                         await _dbContext.SaveChangesAsync();
+
+                        reportElement = await _dbContext.EformReportElements
+                            .Include(x => x.DataItems)
+                            .ThenInclude(x => x.NestedDataItems)
+                            .Include(x => x.NestedElements)
+                            .ThenInclude(x => x.DataItems)
+                            .ThenInclude(x => x.NestedDataItems)
+                            .Where(x => x.EformReportId == eformReport.Id && x.ElementId == templateElement.Id)
+                            .FirstOrDefaultAsync();
                     }
 
 
@@ -404,8 +420,8 @@ public async Task<OperationResult> UpdateEformReport(EformReportFullModel reques
                         if (dataItems.Any())
                         {
                             var dataItemsIds = dataItems.Select(x => x.Id).ToArray();
-                            var eformDataItems = _dbContext.EformReportDataItems
-                                .Where(x => dataItemsIds.Contains(x.Id));
+                            var eformDataItems = await _dbContext.EformReportDataItems
+                                .Where(x => dataItemsIds.Contains(x.Id)).ToListAsync();
 
                             foreach (var eformDataItem in eformDataItems)
                             {

eform-client/src/app/common/services/eform/eform-report.service.ts

@@ -12,7 +12,8 @@ import {
 import {BaseService} from 'src/app/common/services/base.service';
 
 const TemplateReportMethods = {
-  Templates: '/api/templates/',
+  Report: '/api/templates/',
+  UpdateReport: '/api/templates/report',
 };
 
 @Injectable()
@@ -22,10 +23,10 @@ export class EformReportService extends BaseService {
   }
 
   getSingle(templateId: number): Observable<OperationDataResult<EformFullReportModel>> {
-    return this.get(TemplateReportMethods.Templates + templateId + '/report');
+    return this.get(TemplateReportMethods.Report + templateId + '/report');
   }
 
-  updateSingle(model: EformReportModel): Observable<OperationResult> {
-    return this.put(TemplateReportMethods.Templates, model);
+  updateSingle(model: EformFullReportModel): Observable<OperationResult> {
+    return this.put(TemplateReportMethods.UpdateReport, model);
   }
 }

eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html

@@ -171,13 +171,13 @@
                 unarchive
               </i>
             </button>
-            <!--<button class="btn btn-accent text-black-50 btn-icon mb-2" id="eform-report-button"-->
-                    <!--[routerLink]="['./report', templateDto.id]"-->
-                    <!--mdbTooltip="{{ 'Jasper Report' | translate }}">-->
-              <!--<i class="material-icons">-->
-                <!--unarchive-->
-              <!--</i>-->
-            <!--</button>-->
+            <button class="btn btn-accent text-black-50 btn-icon mb-2" id="eform-report-button"
+                    [routerLink]="['./report', templateDto.id]"
+                    mdbTooltip="{{ 'Jasper Report' | translate }}">
+              <i class="material-icons">
+                unarchive
+              </i>
+            </button>
           </div>
         </td>
       </tr>

eform-client/src/app/modules/eforms/eform-report/components/eform-report-block/eform-report-block.component.html

@@ -3,6 +3,7 @@
     <div class="card-body">
       <app-eform-report-switch
         [dragulaContainerName]="element.id + element.label"
+        (dataItemListChanged)="onDataItemListChanged($event)"
         [dataItemList]="element.dataItemList"></app-eform-report-switch>
     </div>
   </div>

eform-client/src/app/modules/eforms/eform-report/components/eform-report-block/eform-report-block.component.ts

@@ -1,19 +1,23 @@
 import {Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChildren} from '@angular/core';
-import {CaseEditRequest, ElementDto} from 'src/app/common/models';
+import {EformReportDataItem, EformReportElement} from 'src/app/common/models';
 
 @Component({
   selector: 'app-eform-report-block',
   templateUrl: './eform-report-block.component.html',
   styleUrls: ['./eform-report-block.component.scss']
 })
 export class EformReportBlockComponent implements OnInit {
-  @ViewChildren(EformReportBlockComponent) editElements: QueryList<EformReportBlockComponent>;
-  @Input() element: ElementDto = new ElementDto();
+  @Input() element: EformReportElement = new EformReportElement();
   @Output() onElementVisibilityChanged: EventEmitter<{id: number, visibility: boolean}> =
     new EventEmitter<{id: number, visibility: boolean}>();
+  @Output() elementChanged: EventEmitter<EformReportElement> = new EventEmitter();
   constructor() { }
 
   ngOnInit() {
   }
 
+  onDataItemListChanged(e: EformReportDataItem[]) {
+    this.element.dataItemList = e;
+    this.elementChanged.emit(this.element);
+  }
 }

eform-client/src/app/modules/eforms/eform-report/components/eform-report-elements/element-audio/element-audio.component.html

@@ -1,13 +1,13 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {FieldValueDto} from 'src/app/common/models';
+import {EformReportDataItemValue, FieldValueDto} from 'src/app/common/models';
 
 @Component({
   selector: 'report-element-multiselect',
   templateUrl: './element-multiselect.component.html',
   styleUrls: ['./element-multiselect.component.scss']
 })
 export class ElementMultiselectComponent implements OnInit {
-  fieldValueObj: FieldValueDto = new FieldValueDto();
+  fieldValueObj: EformReportDataItemValue = new EformReportDataItemValue();
 
   @Input()
   get fieldValue() {
@@ -16,50 +16,11 @@ export class ElementMultiselectComponent implements OnInit {
 
   set fieldValue(val) {
     this.fieldValueObj = val;
-    this.initCheckBoxes();
   }
 
   constructor() {
   }
 
   ngOnInit() {
   }
-
-  updateCheckedOptions(item: any, e: any) {
-    if (!item || !e.target) {
-      return;
-    }
-    if (e.target.checked) {
-      item.selected = true;
-    } else {
-      item.selected = false;
-    }
-    this.refreshValue();
-  }
-
-  initCheckBoxes() {
-    var str = this.fieldValueObj.value;
-    var res = str.split('|');
-    this.fieldValueObj.keyValuePairList.forEach(x => {
-      if (this.arrayContains(x.key.toString(), res)) {
-        x.selected = true;
-      } else {
-        false;
-      }
-    });
-  }
-
-  arrayContains(needle, arrhaystack) {
-    return (arrhaystack.indexOf(needle) > -1);
-  }
-
-  refreshValue() {
-    let str = [];
-    this.fieldValueObj.keyValuePairList.forEach(x => {
-      if (x.selected) {
-        str.push(x.key);
-      }
-    });
-    this.fieldValueObj.value = str.join('|');
-  }
 }

eform-client/src/app/modules/eforms/eform-report/components/eform-report-elements/element-audio/element-audio.component.scss

@@ -1,4 +1,3 @@
-export * from './element-audio/element-audio.component';
 export * from './element-checkbox/element-checkbox.component';
 export * from './element-comment/element-comment.component';
 export * from './element-container/element-container.component';