Merge pull request #22 from Softheon/malvin-dev

Added Currency, DateTime, and PhoneNumber Components and Editors

Author: edriscoll-softheon

package-lock.json

@@ -26,6 +26,7 @@
     "@angular/platform-browser": "^7.2.6",
     "@angular/platform-browser-dynamic": "^7.2.6",
     "@angular/router": "^7.2.6",
+    "angular-mydatepicker": "^0.1.2",
     "core-js": "^2.6.5",
     "ng2-file-upload": "^1.3.0",
     "rxjs": "~6.4.0",

package.json

@@ -4,7 +4,8 @@
   "lib": {
     "entryFile": "src/public_api.ts",
     "umdModuleIds": {
-      "ng2-file-upload": "ng2-file-upload"
+      "ng2-file-upload": "ng2-file-upload",
+      "angular-mydatepicker": "angular-mydatepicker"
     }
   }
 }

projects/forge-lib/ng-package.json

@@ -12,6 +12,9 @@ import { EmailComponent } from '../../shared/form-components/concrete/email/emai
 import { NumberComponent } from '../../shared/form-components/concrete/number/number.component';
 import { RatingComponent } from '../../shared/form-components/concrete/rating/rating.component';
 import { TextAreaComponent } from '../../shared/form-components/concrete/text-area/text-area.component';
+import { CurrencyComponent } from '../../shared/form-components/concrete/currency/currency.component';
+import { DateTimeComponent } from '../../shared/form-components/concrete/date-time/date-time.component';
+import { PhoneNumberComponent } from '../../shared/form-components/concrete/phone-number/phone-number.component';
 
 
 @Injectable({
@@ -234,6 +237,18 @@ export class FormsService {
             this.form.components.push(Object.assign(new TextFieldComponent(), component));
             break;
           }
+          case "Currency": {
+            this.form.components.push(Object.assign(new CurrencyComponent(), component));
+            break;
+          }
+          case "Date Time": {
+            this.form.components.push(Object.assign(new DateTimeComponent(), component));
+            break;
+          }
+          case "Phone Number": {
+            this.form.components.push(Object.assign(new PhoneNumberComponent(), component));
+            break;
+          }
         }
       });
     }

projects/forge-lib/src/lib/core/services/forms.service.ts

@@ -127,6 +127,14 @@ describe('BuilderComponent', () => {
     component.generateComponent(ComponentTypes.Email);
     component.generateComponent(ComponentTypes.Attachment);
     component.generateComponent(ComponentTypes.CheckboxGroup);
+    component.generateComponent(ComponentTypes.Currency);
+    component.generateComponent(ComponentTypes.DateTime);
+    component.generateComponent(ComponentTypes.PhoneNumber);
     expect(component.formsService.form.components.length).toBe(component.components.length);
   });
+
+  it('should create new form', () => {
+    component.createNewForm();
+    expect(component.formsService.form.name).toBe('New Form');
+  });
 });

projects/forge-lib/src/lib/modules/form-builder/components/builder/builder.component.spec.ts

@@ -14,6 +14,9 @@ import { FormBuilderConfig } from '../../../../../lib/configs/form-builder-lib-c
 import { MultiSelectComponent } from '../../../../shared/form-components/concrete/multi-select/multi-select-component';
 import { Form } from '../../../../shared/models/form';
 import { ComponentTypes } from '../../../../shared/constants/component-types';
+import { CurrencyComponent } from '../../../../shared/form-components/concrete/currency/currency.component';
+import { DateTimeComponent } from '../../../../shared/form-components/concrete/date-time/date-time.component';
+import { PhoneNumberComponent } from '../../../../shared/form-components/concrete/phone-number/phone-number.component';
 
 @Component({
   selector: 'forge-form-builder',
@@ -41,7 +44,10 @@ export class BuilderComponent implements OnInit {
     ComponentTypes.Rating,
     ComponentTypes.Email,
     ComponentTypes.Attachment,
-    ComponentTypes.CheckboxGroup
+    ComponentTypes.CheckboxGroup,
+    ComponentTypes.Currency,
+    ComponentTypes.DateTime,
+    ComponentTypes.PhoneNumber
   ];
 
   /**
@@ -140,6 +146,15 @@ export class BuilderComponent implements OnInit {
       } case ComponentTypes.CheckboxGroup: {
         this.addComponent(new MultiSelectComponent(), `${ComponentTypes.CheckboxGroup}_${this.index++}`);
         break;
+      } case ComponentTypes.Currency: {
+        this.addComponent(new CurrencyComponent(), `${ComponentTypes.Currency}_${this.index++}`);
+        break;
+      } case ComponentTypes.DateTime: {
+        this.addComponent(new DateTimeComponent(), `${ComponentTypes.DateTime}_${this.index++}`);
+        break;
+      } case ComponentTypes.PhoneNumber: {
+        this.addComponent(new PhoneNumberComponent(), `${ComponentTypes.PhoneNumber}_${this.index++}`);
+        break;
       }
     }
   }

projects/forge-lib/src/lib/modules/form-builder/components/builder/builder.component.ts

@@ -33,6 +33,20 @@ import { EmailEditorValidationComponent } from '../../../..//shared/form-editor-
 import { NumberDirective } from '../../../../shared/directives/number.directive';
 import { MinValidatorDirective } from '../../../../shared/validators/minValidator';
 import { MaxValidatorDirective } from '../../../../shared/validators/maxValidator';
+import { CurrencyComponent } from '../../../..//shared/form-components/concrete/currency/currency.component';
+import { CurrencyEditorDisplayComponent } from '../../../..//shared/form-editor-components/concrete/currency-editor/display/currency-editor-display.component';
+import { CurrencyEditorDataComponent } from '../../../..//shared/form-editor-components/concrete/currency-editor/data/currency-editor-data.component';
+import { CurrencyEditorValidationComponent } from '../../../..//shared/form-editor-components/concrete/currency-editor/validation/currency-editor-validation.component';
+import { DateTimeComponent } from '../../../..//shared/form-components/concrete/date-time/date-time.component';
+import { DateTimeEditorDisplayComponent } from '../../../..//shared/form-editor-components/concrete/date-time-editor/display/date-time-editor-display.component';
+import { DateTimeEditorDataComponent } from '../../../..//shared/form-editor-components/concrete/date-time-editor/data/date-time-editor-data.component';
+import { DateTimeEditorValidationComponent } from '../../../..//shared/form-editor-components/concrete/date-time-editor/validation/date-time-editor-validation.component';
+import { PhoneNumberComponent } from '../../../..//shared/form-components/concrete/phone-number/phone-number.component';
+import { PhoneNumberEditorDisplayComponent } from '../../../..//shared/form-editor-components/concrete/phone-number-editor/display/phone-number-editor-display.component';
+import { PhoneNumberEditorDataComponent } from '../../../..//shared/form-editor-components/concrete/phone-number-editor/data/phone-number-editor-data.component';
+import { PhoneNumberEditorValidationComponent } from '../../../..//shared/form-editor-components/concrete/phone-number-editor/validation/phone-number-editor-validation.component';
+import { PhoneNumberDirective } from '../../../../shared/directives/phone-number.directive';
+import { AngularMyDatePickerModule } from 'angular-mydatepicker';
 
 describe('FieldEditorComponent', () => {
   let component: FieldEditorComponent;
@@ -67,11 +81,25 @@ describe('FieldEditorComponent', () => {
         EmailComponent,
         EmailEditorDisplayComponent,
         EmailEditorDataComponent,
-        EmailEditorValidationComponent
+        EmailEditorValidationComponent,
+        CurrencyComponent,
+        CurrencyEditorDisplayComponent,
+        CurrencyEditorDataComponent,
+        CurrencyEditorValidationComponent,
+        DateTimeComponent,
+        DateTimeEditorDisplayComponent,
+        DateTimeEditorDataComponent,
+        DateTimeEditorValidationComponent,
+        PhoneNumberComponent,
+        PhoneNumberEditorDisplayComponent,
+        PhoneNumberEditorDataComponent,
+        PhoneNumberEditorValidationComponent,
+        PhoneNumberDirective
       ],
       imports: [
         FormsModule,
-        HttpClientModule
+        HttpClientModule,
+        AngularMyDatePickerModule
       ],
       schemas: [
         CUSTOM_ELEMENTS_SCHEMA
@@ -105,7 +133,19 @@ describe('FieldEditorComponent', () => {
           EmailComponent,
           EmailEditorDisplayComponent,
           EmailEditorDataComponent,
-          EmailEditorValidationComponent
+          EmailEditorValidationComponent,
+          CurrencyComponent,
+          CurrencyEditorDisplayComponent,
+          CurrencyEditorDataComponent,
+          CurrencyEditorValidationComponent,
+          DateTimeComponent,
+          DateTimeEditorDisplayComponent,
+          DateTimeEditorDataComponent,
+          DateTimeEditorValidationComponent,
+          PhoneNumberComponent,
+          PhoneNumberEditorDisplayComponent,
+          PhoneNumberEditorDataComponent,
+          PhoneNumberEditorValidationComponent
         ]
       }
     })
@@ -155,4 +195,19 @@ describe('FieldEditorComponent', () => {
     component.ngOnInit();
     expect(component).toBeTruthy();
   });
+  it('should create with Currency component', () => {
+    component.field = new CurrencyComponent();
+    component.ngOnInit();
+    expect(component).toBeTruthy();
+  });
+  it('should create with Datetime component', () => {
+    component.field = new DateTimeComponent();
+    component.ngOnInit();
+    expect(component).toBeTruthy();
+  });
+  it('should create with PhoneNumber component', () => {
+    component.field = new PhoneNumberComponent();
+    component.ngOnInit();
+    expect(component).toBeTruthy();
+  });
 });