added header for tables in Rule form

sql/createCiviruleRuleAction.sql

@@ -3,14 +3,12 @@ CREATE TABLE IF NOT EXISTS civirule_rule_action (
   rule_id INT UNSIGNED NULL,
   action_id INT UNSIGNED NULL,
   action_value VARCHAR(128) NULL,
-  comparison_id INT UNSIGNED NULL,
   extra_params BLOB NULL,
   civicrm_form_class VARCHAR(256) NULL,
   is_active TINYINT NULL DEFAULT 1,
   UNIQUE INDEX id_UNIQUE (id ASC),
   INDEX fk_ra_rule_idx (rule_id ASC),
   INDEX fk_ra_action_idx (action_id ASC),
-  INDEX fk_ra_comparison_idx (comparison_id ASC),
   CONSTRAINT fk_ra_rule
     FOREIGN KEY (rule_id)
     REFERENCES civirule_rule (id)
@@ -20,11 +18,6 @@ CREATE TABLE IF NOT EXISTS civirule_rule_action (
     FOREIGN KEY (action_id)
     REFERENCES civirule_action (id)
     ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT fk_ra_comparison
-    FOREIGN KEY (comparison_id)
-    REFERENCES civirule_comparison (id)
-    ON DELETE NO ACTION
     ON UPDATE NO ACTION)
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8

sql/create_civirule_action.sql

-CREATE TABLE IF NOT EXISTS `civirule_action` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(64) NULL,
-  `label` VARCHAR(128) NULL,
-  `data_selector_id` INT UNSIGNED NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC),
-  INDEX `fk_data_selector_idx` (`data_selector_id` ASC),
-  CONSTRAINT `fk_data_selector`
-    FOREIGN KEY (`data_selector_id`)
-    REFERENCES `civirule_data_selector` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_comparison.sql

-CREATE TABLE IF NOT EXISTS `civirule_comparison` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `label` VARCHAR(45) NULL,
-  `operator` VARCHAR(45) NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_condition.sql

-CREATE TABLE IF NOT EXISTS `civirule_condition` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(64) NULL,
-  `label` VARCHAR(128) NULL,
-  `function_name` VARCHAR(256) NULL,
-  `civicrm_form_class` VARCHAR(128) NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_data_selector.sql

-CREATE TABLE IF NOT EXISTS `civirule_data_selector` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `entity` VARCHAR(64) NULL,
-  `column` VARCHAR(128) NULL,
-  `label` VARCHAR(68) NULL,
-  `description` TEXT NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_event.sql

-CREATE TABLE IF NOT EXISTS `civirule_event` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(64) NULL,
-  `label` VARCHAR(128) NULL,
-  `entity` VARCHAR(68) NULL,
-  `action` VARCHAR(45) NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_rule.sql

-CREATE TABLE IF NOT EXISTS `civirule_rule` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(64) NULL,
-  `label` VARCHAR(128) NULL,
-  `event_id` INT UNSIGNED NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  `created_date` DATE NULL,
-  `created_contact_id` INT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC),
-  INDEX `fk_rule_event_idx` (`event_id` ASC),
-  CONSTRAINT `fk_rule_event`
-    FOREIGN KEY (`event_id`)
-    REFERENCES `civirule_event` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_rule_action.sql

-CREATE TABLE IF NOT EXISTS `civirule_rule_action` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `rule_id` INT UNSIGNED NULL,
-  `action_id` INT UNSIGNED NULL,
-  `value` VARCHAR(128) NULL,
-  `comparison_id` INT UNSIGNED NULL,
-  `extra_params` TEXT NULL,
-  `civicrm_form_class` VARCHAR(128) NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC),
-  INDEX `fk_ra_rule_idx` (`rule_id` ASC),
-  INDEX `fk_ra_action_idx` (`action_id` ASC),
-  INDEX `fk_ra_comparison_idx` (`comparison_id` ASC),
-  CONSTRAINT `fk_ra_rule`
-    FOREIGN KEY (`rule_id`)
-    REFERENCES `civirule_rule` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_ra_action`
-    FOREIGN KEY (`action_id`)
-    REFERENCES `civirule_action` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_ra_comparison`
-    FOREIGN KEY (`comparison_id`)
-    REFERENCES `civirule_comparison` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

sql/create_civirule_rule_condition.sql

-CREATE TABLE IF NOT EXISTS `civirule_rule_condition` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `rule_id` INT UNSIGNED NULL,
-  `condition_id` INT UNSIGNED NULL,
-  `value` VARCHAR(128) NULL,
-  `comparison_id` INT UNSIGNED NULL,
-  `is_active` TINYINT NULL DEFAULT 1,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `id_UNIQUE` (`id` ASC),
-  INDEX `fk_rc_rule_idx` (`rule_id` ASC),
-  INDEX `fk_rc_condition_idx` (`condition_id` ASC),
-  INDEX `fk_rc_comparison_idx` (`comparison_id` ASC),
-  CONSTRAINT `fk_rc_rule`
-    FOREIGN KEY (`rule_id`)
-    REFERENCES `civirule_rule` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_rc_condition`
-    FOREIGN KEY (`condition_id`)
-    REFERENCES `civirule_condition` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_rc_comparison`
-    FOREIGN KEY (`comparison_id`)
-    REFERENCES `civirule_comparison` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8
-COLLATE = utf8_general_ci

templates/CRM/Civirules/Form/RuleBlocks/ActionBlock.tpl

@@ -5,6 +5,13 @@
   <div class="crm-section">
     <div id="civirule_wrapper" class="dataTables_wrapper">
       <table id="civirule-table" class="display">
+        <thead>
+          <tr>
+            <th>{ts}Description{/ts}</th>
+            <th>{ts}Extra parameters{/ts}</th>
+            <th id="nosort">&nbsp;</th>
+          </tr>
+        </thead>
         <tbody>
           {assign var="row_class" value="odd-row"}
           {foreach from=$ruleActions key=action_id item=ruleAction}

templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl

@@ -5,6 +5,13 @@
   <div class="crm-section">
     <div id="civirule_conditionBlock-wrapper" class="dataTables_wrapper">
       <table id="civirule-conditionBlock-table" class="display">
+        <thead>
+          <tr>
+            <th>{ts}Operator{/ts}</th>
+            <th>{ts}Description{/ts}</th>
+            <th>&nbsp;</th>
+        </tr>
+        </thead>
         <tbody>
           {assign var="row_class" value="odd-row"}
           {foreach from=$ruleConditions key=ruleConditionIid item=ruleCondition}