Improve consistency of field titles, labels, types across the schema

CRM/ACL/DAO/ACL.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:945c6124726a8a24c2b1915f892e5d7f)
+ * (GenCodeChecksum:3f7dd0002b1f610838f8c50604c15344)
  */
 
 /**
@@ -159,6 +159,9 @@ public static function &fields() {
           'entity' => 'ACL',
           'bao' => 'CRM_ACL_BAO_ACL',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '1.6',
         ],
         'name' => [

CRM/ACL/DAO/ACLCache.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d578da6a914d1f86daeff26e50653fc4)
+ * (GenCodeChecksum:51f4d5ab70bf89827f6f393037b94dc8)
  */
 
 /**
@@ -110,12 +110,15 @@ public static function &fields() {
           'entity' => 'ACLCache',
           'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '1.6',
         ],
         'contact_id' => [
           'name' => 'contact_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Cache Contact'),
+          'title' => ts('Contact ID'),
           'description' => ts('Foreign Key to Contact'),
           'where' => 'civicrm_acl_cache.contact_id',
           'table_name' => 'civicrm_acl_cache',
@@ -124,13 +127,14 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'EntityRef',
+            'label' => ts("Contact"),
           ],
           'add' => '1.6',
         ],
         'acl_id' => [
           'name' => 'acl_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Cache ACL'),
+          'title' => ts('ACL ID'),
           'description' => ts('Foreign Key to ACL'),
           'required' => TRUE,
           'where' => 'civicrm_acl_cache.acl_id',
@@ -139,6 +143,9 @@ public static function &fields() {
           'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
           'FKClassName' => 'CRM_ACL_DAO_ACL',
+          'html' => [
+            'label' => ts("ACL"),
+          ],
           'pseudoconstant' => [
             'table' => 'civicrm_acl',
             'keyColumn' => 'id',

CRM/ACL/DAO/EntityRole.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:012d2481ba1ccdef7d19a17eae876597)
+ * (GenCodeChecksum:cf9e0c31213828937213142e8b09f8dc)
  */
 
 /**
@@ -117,6 +117,9 @@ public static function &fields() {
           'entity' => 'EntityRole',
           'bao' => 'CRM_ACL_BAO_EntityRole',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '1.6',
         ],
         'acl_role_id' => [

CRM/Activity/DAO/Activity.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e40c263d7d030dc0c6d6e714317a3970)
+ * (GenCodeChecksum:720be1c759309d7831d6301f28f17257)
  */
 
 /**
@@ -293,6 +293,9 @@ public static function &fields() {
           'entity' => 'Activity',
           'bao' => 'CRM_Activity_BAO_Activity',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '1.1',
         ],
         'source_record_id' => [
@@ -414,7 +417,7 @@ public static function &fields() {
         'phone_id' => [
           'name' => 'phone_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Phone (called) ID'),
+          'title' => ts('Phone ID (called)'),
           'description' => ts('Phone ID of the number called (optional - used if an existing phone number is selected).'),
           'where' => 'civicrm_activity.phone_id',
           'table_name' => 'civicrm_activity',
@@ -509,14 +512,17 @@ public static function &fields() {
         'parent_id' => [
           'name' => 'parent_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Parent Activity Id'),
+          'title' => ts('Parent Activity ID'),
           'description' => ts('Parent meeting ID (if this is a follow-up item). This is not currently implemented'),
           'where' => 'civicrm_activity.parent_id',
           'table_name' => 'civicrm_activity',
           'entity' => 'Activity',
           'bao' => 'CRM_Activity_BAO_Activity',
           'localizable' => 0,
           'FKClassName' => 'CRM_Activity_DAO_Activity',
+          'html' => [
+            'label' => ts("Parent Activity"),
+          ],
           'add' => '1.1',
         ],
         'activity_is_test' => [
@@ -572,7 +578,7 @@ public static function &fields() {
         'relationship_id' => [
           'name' => 'relationship_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Relationship Id'),
+          'title' => ts('Relationship ID'),
           'description' => ts('FK to Relationship ID'),
           'where' => 'civicrm_activity.relationship_id',
           'default' => 'NULL',
@@ -581,6 +587,9 @@ public static function &fields() {
           'bao' => 'CRM_Activity_BAO_Activity',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Relationship',
+          'html' => [
+            'label' => ts("Relationship"),
+          ],
           'add' => '2.2',
         ],
         'is_current_revision' => [
@@ -601,14 +610,17 @@ public static function &fields() {
         'original_id' => [
           'name' => 'original_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Original Activity ID '),
+          'title' => ts('Original Activity ID'),
           'description' => ts('Activity ID of the first activity record in versioning chain.'),
           'where' => 'civicrm_activity.original_id',
           'table_name' => 'civicrm_activity',
           'entity' => 'Activity',
           'bao' => 'CRM_Activity_BAO_Activity',
           'localizable' => 0,
           'FKClassName' => 'CRM_Activity_DAO_Activity',
+          'html' => [
+            'label' => ts("Original Activity"),
+          ],
           'add' => '2.2',
         ],
         'activity_result' => [
@@ -646,7 +658,7 @@ public static function &fields() {
         'activity_campaign_id' => [
           'name' => 'campaign_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Campaign'),
+          'title' => ts('Campaign ID'),
           'description' => ts('The campaign for which this activity has been triggered.'),
           'import' => TRUE,
           'where' => 'civicrm_activity.campaign_id',
@@ -658,6 +670,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
             'type' => 'Select',
+            'label' => ts("Campaign"),
           ],
           'add' => '3.4',
         ],

CRM/Activity/DAO/ActivityContact.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/ActivityContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ea2c719e3d50906c6e8695743b39f3d1)
+ * (GenCodeChecksum:e713c308a3c7d44cb334af9c97b9939e)
  */
 
 /**
@@ -111,6 +111,9 @@ public static function &fields() {
           'entity' => 'ActivityContact',
           'bao' => 'CRM_Activity_BAO_ActivityContact',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '4.4',
         ],
         'activity_id' => [
@@ -125,12 +128,15 @@ public static function &fields() {
           'bao' => 'CRM_Activity_BAO_ActivityContact',
           'localizable' => 0,
           'FKClassName' => 'CRM_Activity_DAO_Activity',
+          'html' => [
+            'label' => ts("Activity"),
+          ],
           'add' => '4.4',
         ],
         'contact_id' => [
           'name' => 'contact_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Contact ID (match to contact)'),
+          'title' => ts('Contact ID'),
           'description' => ts('Foreign key to the contact for this record.'),
           'required' => TRUE,
           'import' => TRUE,
@@ -141,6 +147,9 @@ public static function &fields() {
           'bao' => 'CRM_Activity_BAO_ActivityContact',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
+          'html' => [
+            'label' => ts("Contact"),
+          ],
           'add' => '4.4',
         ],
         'record_type_id' => [

CRM/Batch/DAO/Batch.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/Batch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d8e02b922579edb2fc29f4717ba25699)
+ * (GenCodeChecksum:00a7601bf04fcaa5c8d5ae2e7f916d4f)
  */
 
 /**
@@ -201,6 +201,9 @@ public static function &fields() {
           'entity' => 'Batch',
           'bao' => 'CRM_Batch_BAO_Batch',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '3.3',
         ],
         'name' => [
@@ -257,14 +260,17 @@ public static function &fields() {
         'created_id' => [
           'name' => 'created_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Batch Created By'),
+          'title' => ts('Created By Contact ID'),
           'description' => ts('FK to Contact ID'),
           'where' => 'civicrm_batch.created_id',
           'table_name' => 'civicrm_batch',
           'entity' => 'Batch',
           'bao' => 'CRM_Batch_BAO_Batch',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
+          'html' => [
+            'label' => ts("Created By"),
+          ],
           'add' => '3.3',
         ],
         'created_date' => [
@@ -286,14 +292,17 @@ public static function &fields() {
         'modified_id' => [
           'name' => 'modified_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Batch Modified By'),
+          'title' => ts('Modified By Contact ID'),
           'description' => ts('FK to Contact ID'),
           'where' => 'civicrm_batch.modified_id',
           'table_name' => 'civicrm_batch',
           'entity' => 'Batch',
           'bao' => 'CRM_Batch_BAO_Batch',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
+          'html' => [
+            'label' => ts("Modified By"),
+          ],
           'add' => '3.3',
         ],
         'modified_date' => [
@@ -311,7 +320,7 @@ public static function &fields() {
         'saved_search_id' => [
           'name' => 'saved_search_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Batch Smart Group'),
+          'title' => ts('Smart Group ID'),
           'description' => ts('FK to Saved Search ID'),
           'where' => 'civicrm_batch.saved_search_id',
           'table_name' => 'civicrm_batch',
@@ -321,6 +330,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Contact_DAO_SavedSearch',
           'html' => [
             'type' => 'EntityRef',
+            'label' => ts("Smart Group"),
           ],
           'add' => '4.1',
         ],

CRM/Batch/DAO/EntityBatch.php

@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/EntityBatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9d04febc575fa821cc186aecfbce8965)
+ * (GenCodeChecksum:415abafe49306753bf320774a6c9207b)
  */
 
 /**
@@ -111,6 +111,9 @@ public static function &fields() {
           'entity' => 'EntityBatch',
           'bao' => 'CRM_Batch_BAO_EntityBatch',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '3.3',
         ],
         'entity_table' => [
@@ -152,6 +155,9 @@ public static function &fields() {
           'bao' => 'CRM_Batch_BAO_EntityBatch',
           'localizable' => 0,
           'FKClassName' => 'CRM_Batch_DAO_Batch',
+          'html' => [
+            'label' => ts("Batch"),
+          ],
           'pseudoconstant' => [
             'table' => 'civicrm_batch',
             'keyColumn' => 'id',