Merge pull request #1575 from NishkalankBezawada/Issue-1174

Fixing Issue 1571 & Partial fix for 1174

Author: AJIXuMuK

src/controls/dynamicForm/DynamicForm.tsx

@@ -207,6 +207,12 @@ export class DynamicForm extends React.Component<
             val.fieldDefaultValue = null;
             shouldBeReturnBack = true;
           }
+        } else if(val.fieldType === "Number"){
+          if(!val.showAsPercentage){
+            if((val.newValue < val.minimumValue) || (val.newValue > val.maximumValue)){
+              shouldBeReturnBack = true;
+            }
+          }
         }
       });
       if (shouldBeReturnBack) {
@@ -709,6 +715,9 @@ export class DynamicForm extends React.Component<
             listItemId: listItemId,
             principalType: principalType,
             description: field.Description,
+            maximumValue:field.MaximumValue,
+            minimumValue:field.MinimumValue,
+            showAsPercentage:field.ShowAsPercentage
           });
           tempFields.sort((a, b) => a.Order - b.Order);
         }

src/controls/dynamicForm/dynamicField/DynamicField.tsx

@@ -95,6 +95,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
 
     const labelEl = <label className={(required) ? styles.fieldRequired + ' ' + styles.fieldLabel : styles.fieldLabel}>{labelText}</label>;
     const errorText = this.getRequiredErrorText();
+    const errorTextforNumber = this.getnumberErrorText();
     const errorTextEl = <text className={styles.errormessage}>{errorText}</text>;
     const descriptionEl = <text className={styles.fieldDescription}>{description}</text>;
     const hasImage = !!changedValue;
@@ -271,7 +272,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
             onChange={(e, newText) => { this.onChange(newText); }}
             disabled={disabled}
             onBlur={this.onBlur}
-            errorMessage={errorText} />
+            errorMessage={errorTextforNumber} />
           {descriptionEl}
         </div>;
 
@@ -590,6 +591,27 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
     return (changedValue === undefined || changedValue === ''|| changedValue === null || this.isEmptyArray(changedValue)) && this.props.required ? strings.DynamicFormRequiredErrorMessage : null;
   }
 
+  private getnumberErrorText = (): string => {
+    const {
+      changedValue
+    } = this.state;
+    const{
+      maximumValue,
+      minimumValue,
+      showAsPercentage
+    } = this.props;
+
+    if((changedValue === undefined || changedValue === ''|| changedValue === null || this.isEmptyArray(changedValue)) && this.props.required){
+      return strings.DynamicFormRequiredErrorMessage;
+    } else if((changedValue < minimumValue) || (changedValue > maximumValue)){
+      if(!showAsPercentage){
+        return strings.DynamicFormNumberErrorMessage
+                .replace('{0}', minimumValue.toString())
+                .replace('{1}', maximumValue.toString());
+      }
+    }
+  }
+
   private isEmptyArray(value): boolean {
     return Array.isArray(value) && value.length === 0;
   }

src/controls/dynamicForm/dynamicField/IDynamicFieldProps.ts

@@ -34,4 +34,7 @@ export interface IDynamicFieldProps {
   additionalData?: FieldChangeAdditionalData;
   principalType?:string;
   description?: string;
+  maximumValue?: number;
+  minimumValue?: number;
+  showAsPercentage?: boolean;
 }

src/loc/bg-bg.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Алтернативен текст",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "The value of this field must be between {0} and {1}.",
   "customDisplayName": "Използвайте това местоположение:",
   "ListItemCommentDIalogDeleteSubText": "Наистина ли искате да изтриете този коментар?",
   "ListItemCommentsDialogDeleteTitle": "Потвърдете Изтриване на коментар",

src/loc/ca-es.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Text alternatiu",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "The value of this field must be between {0} and {1}.",
   "customDisplayName": "Utilitzeu aquesta ubicació:",
   "ListItemCommentDIalogDeleteSubText": "Esteu segur que voleu suprimir aquest comentari?",
   "ListItemCommentsDialogDeleteTitle": "Confirmació de la supressió del comentari",

src/loc/da-dk.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Alternativ tekst",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "Værdien af ​​dette felt skal være mellem {0} og {1}.",
   "customDisplayName": "Brug denne placering:",
   "ListItemCommentDIalogDeleteSubText": "Er du sikker på, at du vil slette denne kommentar?",
   "ListItemCommentsDialogDeleteTitle": "Bekræft kommentar til sletning",

src/loc/de-de.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Alternativtext",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "Der Wert dieses Feldes muss zwischen {0} und {1} liegen.",
   "customDisplayName": "Verwenden Sie diesen Speicherort:",
   "ListItemCommentDIalogDeleteSubText": "Sind Sie sicher, dass Sie diesen Kommentar löschen möchten?",
   "ListItemCommentsDialogDeleteTitle": "Kommentar löschen bestätigen",

src/loc/el-gr.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Εναλλακτικό κείμενο",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "Η τιμή αυτού του πεδίου πρέπει να είναι μεταξύ {0} και {1}.",
   "customDisplayName": "Χρησιμοποιήστε αυτήν τη θέση:",
   "ListItemCommentDIalogDeleteSubText": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το σχόλιο;",
   "ListItemCommentsDialogDeleteTitle": "Επιβεβαίωση διαγραφής σχολίου",

src/loc/en-us.ts

@@ -384,6 +384,7 @@ define([], () => {
     DynamicFormEnterDescriptionPlaceholder: "Alternative text",
     DynamicFormDialogValidationErrorTitle: "Validation Error",
     DynamicFormDialogValidationErrorMessage: "There are validation errors, please fix them before saving.",
+    DynamicFormNumberErrorMessage: "The value of this field must be between {0} and {1}.",
     customDisplayName: "Use this location:",
     ListItemCommentDIalogDeleteSubText: "Are you sure that you want to delete this comment?",
     ListItemCommentsDialogDeleteTitle: "Confirm Delete Comment",

src/loc/es-es.ts

@@ -366,6 +366,7 @@ define([], () => {
   "DynamicFormEnterDescriptionPlaceholder": "Texto alternativo",
   "DynamicFormDialogValidationErrorTitle": "Validation Error",
   "DynamicFormDialogValidationErrorMessage": "There are validation errors, please fix them before saving.",
+  "DynamicFormNumberErrorMessage": "The value of this field must be between {0} and {1}.",
   "customDisplayName": "Utilice esta ubicación:",
   "ListItemCommentDIalogDeleteSubText": "¿Está seguro de que desea eliminar este comentario?",
   "ListItemCommentsDialogDeleteTitle": "Confirmar comentario de eliminación",