Merge pull request #391 from compucorp/staging

Sync master with staging
compucorp · Jul 18, 2018 · d104453 · d104453
2 parents cc108c0 + 743e16c
commit d104453
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 32 deletions.
diff --git a/uk.co.compucorp.civicrm.tasksassignments/CRM/Tasksassignments/Upgrader.php b/uk.co.compucorp.civicrm.tasksassignments/CRM/Tasksassignments/Upgrader.php
@@ -226,6 +226,12 @@ public function upgrade_0008() {
     return TRUE;
   }
 
+  public function upgrade_0009() {
+    $this->executeCustomDataFile('xml/probation.xml');
+
+    return TRUE;
+  }
+
   /*
    * Enable CiviTask and CiviDocument components.
    */
@@ -882,36 +888,6 @@ public function upgrade_1039() {
     return TRUE;
   }
 
-  /**
-   * Deletes or disables "Probation" custom group
-   *
-   * @return bool
-   */
-  public function upgrade_1040() {
-    $result = civicrm_api3('CustomGroup', 'get', [
-      'name' => 'Probation',
-    ]);
-    if ($result['count'] == 0) {
-      return TRUE;
-    }
-
-    $customGroupTable = $result['values'][$result['id']]['table_name'];
-    $sql = "SELECT * FROM `" . $customGroupTable . "`";
-    $sqlResult = CRM_Core_DAO::executeQuery($sql);
-
-    if ($sqlResult->N == 0) {
-      civicrm_api3('CustomGroup', 'delete', ['id' => $result['id']]);
-    }
-    else {
-      civicrm_api3('CustomGroup', 'create', [
-        'id' => $result['id'],
-        'is_active' => 0
-      ]);
-    }
-
-    return TRUE;
-  }
-
   public function uninstall() {
     CRM_Core_DAO::executeQuery("DELETE FROM `civicrm_navigation` WHERE name IN ('tasksassignments', 'ta_dashboard_tasks', 'ta_dashboard_documents', 'ta_dashboard_calendar', 'ta_dashboard_keydates', 'tasksassignments_administer', 'ta_settings')");
     CRM_Core_BAO_Navigation::resetNavigation();

diff --git a/uk.co.compucorp.civicrm.tasksassignments/js/dist/tasks-assignments.min.js b/uk.co.compucorp.civicrm.tasksassignments/js/dist/tasks-assignments.min.js
diff --git a/...pucorp.civicrm.tasksassignments/js/src/tasks-assignments/modules/tasks-assignments.run.js b/...pucorp.civicrm.tasksassignments/js/src/tasks-assignments/modules/tasks-assignments.run.js
@@ -43,7 +43,8 @@ define([
         obj: {
           period_start_date: 'Contract Start Date',
           period_end_date: 'Contract End Date',
-          birth_date: 'Birthday'
+          birth_date: 'Birthday',
+          probation_end_date: 'Probation End Date'
         },
         arr: []
       },

diff --git a/uk.co.compucorp.civicrm.tasksassignments/xml/probation.xml b/uk.co.compucorp.civicrm.tasksassignments/xml/probation.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<CustomData>
+  <CustomGroups>
+    <CustomGroup>
+      <name>Probation</name>
+      <title>Probation</title>
+      <extends>Individual</extends>
+      <style>Inline</style>
+      <collapse_display>0</collapse_display>
+      <help_pre></help_pre>
+      <help_post></help_post>
+      <weight>13</weight>
+      <is_active>1</is_active>
+      <table_name>civicrm_value_probation_12</table_name>
+      <is_multiple>0</is_multiple>
+      <collapse_adv_display>0</collapse_adv_display>
+      <is_reserved>0</is_reserved>
+    </CustomGroup>
+  </CustomGroups>
+  <CustomFields>
+    <CustomField>
+      <name>Probation_End_Date</name>
+      <label>Probation End Date</label>
+      <data_type>Date</data_type>
+      <html_type>Select Date</html_type>
+      <is_required>0</is_required>
+      <is_searchable>1</is_searchable>
+      <is_search_range>1</is_search_range>
+      <weight>1</weight>
+      <is_active>1</is_active>
+      <is_view>0</is_view>
+      <text_length>255</text_length>
+      <date_format>yy-mm-dd</date_format>
+      <note_columns>60</note_columns>
+      <note_rows>4</note_rows>
+      <column_name>probation_end_date</column_name>
+      <custom_group_name>Probation</custom_group_name>
+    </CustomField>
+  </CustomFields>
+</CustomData>