Fixed #5

CRM/FormProcessor/BAO/FormProcessorInput.php

@@ -146,6 +146,41 @@ class CRM_FormProcessor_BAO_FormProcessorInput extends CRM_FormProcessor_DAO_For
       self::deleteWithId($input->id);
     }
   }
+
+  /**
+   * Public function to generate name from title
+   *
+   * @param $title
+   *
+   * @return string
+   * @access public
+   * @static
+   */
+  public static function buildNameFromTitle($title) {
+    $titleParts = explode(' ', strtolower($title));
+    $nameString = implode('_', $titleParts);
+    return substr($nameString, 0, 80);
+  }
+
+  /**
+   * Returns whether the name is valid or not
+   *
+   * @param string $name
+   * @param int $id optional
+   *
+   * @return bool
+   * @static
+   */
+  public static function isNameValid($name, $id = NULL) {
+    $sql = "SELECT COUNT(*) FROM `civicrm_form_processor_input` WHERE `name` = %1";
+    $params[1] = [$name, 'String'];
+    if ($id) {
+      $sql .= " AND `id` != %2";
+      $params[2] = [$id, 'Integer'];
+    }
+    $count = CRM_Core_DAO::singleValueQuery($sql, $params);
+    return ($count > 0) ? FALSE : TRUE;
+  }
 	
 	
 }
\ No newline at end of file

CRM/FormProcessor/DAO/FormProcessorInput.php

@@ -43,6 +43,13 @@ class CRM_FormProcessor_DAO_FormProcessorInput extends CRM_Core_DAO {
           'required' => true,
           'FKApiName' => 'FormProcessorInstance',
         ),
+        'title' => array(
+          'name' => 'title',
+          'title' => E::ts('Title'),
+          'type' => CRM_Utils_Type::T_STRING,
+          'maxlength' => 128,
+          'required' => true,
+        ) ,
         'name' => array(
           'name' => 'name',
           'title' => E::ts('Name'),
@@ -90,6 +97,7 @@ class CRM_FormProcessor_DAO_FormProcessorInput extends CRM_Core_DAO {
       self::$_fieldKeys = array(
         'id' => 'id', 
         'form_processor_instance_id' => 'form_processor_instance_id',
+        'title' => 'title',
         'name' => 'name',
         'type' => 'type',
         'is_required' => 'is_required',

CRM/FormProcessor/Upgrader.php

@@ -16,6 +16,12 @@ class CRM_FormProcessor_Upgrader extends CRM_FormProcessor_Upgrader_Base {
     return TRUE;
   }
 
+  public function upgrade_1002() {
+    CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_form_processor_input` ADD COLUMN `title` VARCHAR(128) NULL AFTER `form_processor_instance_id`");
+    CRM_Core_DAO::executeQuery("UPDATE `civicrm_form_processor_input` SET `title` = `name`");
+    return true;
+  }
+
   /**
    * Example: Work with entities usually not available during the install step.
    *

ang/form_processor/inputs/InputDialogCtrl.html

@@ -4,23 +4,33 @@
     	<div crm-ui-field="{name: 'InputForm.type', title: ts('Type')}">
     		<div>{{input.type.label}}</div>
   		</div>
+
+		<div crm-ui-field="{name: 'InputForm.title', title: ts('Title'), required: true}">
+			<input
+					crm-ui-id="InputForm.title"
+					type="text"
+					name="title"
+					ng-model="input.title"
+					class="big crm-form-text"
+					required
+					autofocus
+			/>
+		</div>
     	
     	<div crm-ui-field="{name: 'InputForm.name', title: ts('Name')}">
-      <input
-        crm-ui-id="InputForm.name"
-        type="text"
-        name="name"
-        ng-model="input.name"
-        class="big crm-form-text"
-        required
-        autofocus
-        />
-        <div ng-show="invalidName">
-        	<em>{{ts('WARNING: The name of the input is invalid (Only lowercase characters and _ are allowed).')}}</em>
-      	</div>
-      	<div ng-show="nameExists">
-        	<em>{{ts('WARNING: The name of the input already exists.')}}</em>
-      	</div>
+            <input
+                    crm-ui-id="InputForm.name"
+                    type="text"
+                    name="name"
+                    ng-model="input.name"
+                    ng-disabled="locks.name"
+                    required
+                    class="big crm-form-text"/>
+			<a crm-ui-lock binding="locks.name"></a>
+
+			<div ng-show="!isValidName(input.name) || !isNameValid">
+				<em>{{ts('WARNING: The name includes invalid characters or is already in use by another input.')}}</em>
+			</div>
 	    </div>
 	
 			<div crm-ui-field="{title: ts('Is required?')}">

ang/form_processor/inputs/InputDialogCtrl.js

 (function(angular, $, _) {
 
-  angular.module('form_processor').controller('InputDialogCtrl', function InputDialogCtrl($scope, dialogService) {
+  angular.module('form_processor').controller('InputDialogCtrl', function InputDialogCtrl($scope, dialogService, crmApi) {
     $scope.ts = CRM.ts(null);
     $scope.input = angular.copy($scope.model.input);
-    $scope.invalidName = false;
-    $scope.nameExists = false;
+    $scope.locks = {name: true};
+    $scope.isNameValid = false;
   	$scope.validators = CRM.form_processor.validators;
   	
   	if (!$scope.input.deletedValidators) {
   		$scope.input.deletedValidators = [];
   	}
-    
+
     $scope.$watch('input.name', function(newName, oldName) {
-    	$scope.invalidName = newName && !newName.match(/^[a-z0-9_]+$/) ? true : false;
-    	$scope.nameExists = false;
-    	if (newName && !$scope.invalidName) {
-    		// Check whether the name already exists
-    		angular.forEach($scope.model.inputs, function(input, key) {
-    			if (input != $scope.input && input.name == newName) {
-    				$scope.nameExists = true;
-    			}
-    		});
-    	}
+      // Watch for changes in the name field
+      $scope.isNameValid = false;
+      if (newName) {
+        crmApi($scope.model.entity, 'validatename', {'name': newName,'id': $scope.input.id})
+          .then(function(data) {
+            if (data.is_valid) {
+              $scope.isNameValid = true;
+            }
+          });
+      }
     }, true);
+
+    $scope.$watch('input.title', function(newTitle, oldTitle) {
+      // Watch for changes in the name field
+      if ($scope.locks.name && $scope.input.id <= 0) {
+        $scope.input.name = newTitle;
+        $scope.input.name = $scope.input.name.toLowerCase();
+        $scope.input.name = $scope.input.name.replace(/[^a-zA-Z\d]/g, '_');
+        $scope.input.name = $scope.input.name.replace(/_+n/g, '_');
+      }
+    }, true);
+
+    $scope.isValidName = function(name) {
+      return (!name) || name.match(/^[a-z0-9_]+$/) ? true : false;
+    };
     
     $scope.saveClick = function() {
     	$scope.model.input = $scope.input;

ang/form_processor/inputs/crmFormProcessorInputs.html

@@ -2,7 +2,8 @@
 <table>
   <thead>
 	  <tr>
-	    <th>{{ts('Name')}}</th>
+		<th>{{ts('Title')}}</th>
+		<th>{{ts('Name')}}</th>
 	    <th>{{ts('Type')}}</th>
 	    <th>{{ts('Is required')}}</th>
 	    <th>{{ts('Default value')}}</th>
@@ -12,7 +13,8 @@
   </thead>
   <tbody>
 	  <tr ng-repeat="input in inputs | orderBy:'name'" ng-class-even="'crm-entity even-row even'" ng-class-odd="'crm-entity odd-row odd'">
-	    <td>{{input.name}}</td>
+		<td>{{input.title}}</td>
+		<td>{{input.name}}</td>
 	    <td>{{input.type.label}}</td>
 	    <td>{{input.is_required == 1 ? ts('Yes') : ts('No')}}</td>
 	    <td>{{input.default_value}}</td>

ang/form_processor/inputs/crmFormProcessorInputs.js

@@ -45,6 +45,7 @@
 		    	var input = {
 		    		'id': $scope.new_id,
 		    		'type': angular.copy(inputType),
+						'title': '',
 		      	'name': '',
 		  			'is_required': 0,
 		  			'default_value': '',

api/v3/FormProcessorInput/Converttitletoname.php

+<?php
+
+use CRM_FormProcessor_ExtensionUtil as E;
+
+/**
+ * FormProcessorInput.Converttitletoname API
+ *
+ * @param array $params
+ * @return array API result descriptor
+ * @see civicrm_api3_create_success
+ * @see civicrm_api3_create_error
+ * @throws API_Exception
+ */
+function civicrm_api3_form_processor_input_converttitletoname($params) {
+	$title = $params['title'];
+  $returnValues['name'] = CRM_FormProcessor_BAO_FormProcessorInput::buildNameFromTitle($title);
+  return $returnValues;
+}
+
+/**
+ * FormProcessorInput.Converttitletoname API specification (optional)
+ * This is used for documentation and validation.
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
+ */
+function _civicrm_api3_form_processor_input_converttitletoname_spec(&$spec) {
+	$spec['title'] = array(
+		'title' => E::ts('Title'),
+		'type' => CRM_Utils_Type::T_STRING,
+		'api.required' => true
+	);
+}
\ No newline at end of file

api/v3/FormProcessorInput/Create.php

@@ -22,6 +22,11 @@ function _civicrm_api3_form_processor_input_create_spec(&$spec) {
 		'api.required' => true,
 		'FKApiName' => 'FormProcessorInstance',
 	);
+  $spec['title'] = array(
+    'title' => E::ts('Title'),
+    'type' => CRM_Utils_Type::T_STRING,
+    'api.required' => true
+  );
 	$spec['name'] = array(
 		'title' => E::ts('Name'),
 		'type' => CRM_Utils_Type::T_STRING,

api/v3/FormProcessorInput/Validatename.php

+<?php
+
+use CRM_FormProcessor_ExtensionUtil as E;
+
+/**
+ * FormProcessorInput.Validatename API
+ *
+ * @param array $params
+ * @return array API result descriptor
+ * @see civicrm_api3_create_success
+ * @see civicrm_api3_create_error
+ * @throws API_Exception
+ */
+function civicrm_api3_form_processor_input_validatename($params) {
+	$name = $params['name'];
+	$id = isset($params['id']) ? $params['id'] : null;
+  $returnValues['name'] = $name;
+  $returnValues['is_valid'] = CRM_FormProcessor_BAO_FormProcessorInput::isNameValid($name, $id);
+  return $returnValues;
+}
+
+/**
+ * FormProcessorInput.Validatename API specification (optional)
+ * This is used for documentation and validation.
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
+ */
+function _civicrm_api3_form_processor_input_validatename_spec(&$spec) {
+	$spec['id'] = array(
+		'title' => E::ts('ID'),
+		'type' => CRM_Utils_Type::T_INT,
+		'api.required' => false
+	);
+	$spec['name'] = array(
+		'title' => E::ts('Name'),
+		'type' => CRM_Utils_Type::T_STRING,
+		'api.required' => true
+	);
+}
\ No newline at end of file

sql/create_civicrm_form_processor.sql

@@ -22,6 +22,7 @@ CREATE TABLE IF NOT EXISTS `civicrm_form_processor_instance` (
 CREATE TABLE IF NOT EXISTS `civicrm_form_processor_input` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `form_processor_instance_id` INT UNSIGNED NOT NULL,
+  `title` VARCHAR(128) NULL,
   `name` VARCHAR(80) NOT NULL,
   `type` VARCHAR(80) NOT NULL,
   `is_required` TINYINT NULL DEFAULT 0,