Adding Date and working on fereign keys

front/app/src/common/crud/card/card.component.ts

@@ -1,12 +1,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { FormlyFieldConfig } from '@ngx-formly/core'
-import { FormlyJsonschema } from '@ngx-formly/core/json-schema';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { CrudService } from '../crud.service'
 import { BehaviorSubject } from "rxjs";
-import { JsonschemasService } from "../jsonschemas.service";
+import {CrudFormlyJsonschemaService} from "../crud-formly-jsonschema.service";
 
 export interface Model {
   email: string;
@@ -33,27 +32,27 @@ export class CardComponent implements OnInit {
   }
 
   constructor(private crudService: CrudService,
-              private jsonSchemasService: JsonschemasService,
-              private formlyJsonschema: FormlyJsonschema,
+              private formlyJsonschema: CrudFormlyJsonschemaService,
               private router: Router,
               private route: ActivatedRoute,
   ) { }
 
     ngOnInit(): void {
         this._loading$.next(true);
+        let fields$;
         if (this.isCreateForm()) {
-            this.jsonSchemasService.getCreateResource(this.resource!).subscribe((schemas: any) => {
-                this.fields = [this.formlyJsonschema.toFieldConfig(schemas)];
-            })
+            fields$ = this.formlyJsonschema.getCreateFields(this.resource!);
         } else {
-            this.jsonSchemasService.getUpdateResource(this.resource!).subscribe((schemas: any) => {
-                this.fields = [this.formlyJsonschema.toFieldConfig(schemas)];
-            })
             this.crudService.get(this.resource!, this.resource_id!).subscribe((model: any) => {
                 this.model = model
                 this._loading$.next(false);
             });
+            fields$ = this.formlyJsonschema.getUpdateFields(this.resource!);
         }
+
+        fields$.subscribe((fields: any) => {
+            this.fields = [fields]
+        });
     }
 
   onSubmit(model: any) {