CRM-14483 - crmCaseType - Implement row addition for activity sets

This abstracts some of the code used for addition of activity types

diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js
index c7b48bc355ba9d4a875602eb506682f698a573f1..6873223b2f02852e4e01ae5ced22ac679ae23228 100644 (file)
--- a/js/angular-crmCaseType.js
+++ b/js/angular-crmCaseType.js
@@ -15,6 +15,20 @@
     }
   ]);
 
+  // Add a new record by name.
+  // Ex: <crmAddName crm-options="['Alpha','Beta','Gamma']" crm-var="newItem" crm-on-add="callMyCreateFunction(newItem)" />
+  crmCaseType.directive('crmAddName', function(){
+    return {
+      restrict: 'AE',
+      scope: {
+        crmOptions: '=',
+        crmVar: '=',
+        crmOnAdd: '&'
+      },
+      templateUrl: partialUrl('addName.html')
+    };
+  });
+
   crmCaseType.controller('CaseTypeCtrl', function($scope) {
     $scope.partialUrl = partialUrl;
 

diff --git a/partials/crmCaseType/activityTypesTable.html b/partials/crmCaseType/activityTypesTable.html
index a2299e3ff1a0bbf3416f250938c80733d5df5547..27ae5b12851a4b292051673e5de556d11eacdf7c 100644 (file)
--- a/partials/crmCaseType/activityTypesTable.html
+++ b/partials/crmCaseType/activityTypesTable.html
@@ -27,19 +27,11 @@ Required vars: caseType
   </tr>
   <tr class="addRow">
     <td colspan="3">
-      Add:
-        <input
-                ui-jq="autocomplete"
-                ui-options="{source:activityTypeNames}"
-                ng-model="newTimelineActivity"
-                class="add-activity"
-                />
-        <button
-                ng-class="{disabled: (newTimelineActivity == '' || newTimelineActivity == null)}"
-                ng-disabled="newTimelineActivity == '' || newTimelineActivity == null"
-                ng-click="addActivityType(newTimelineActivity); newTimelineActivity = ''"
-                >Add</button>
-      <!-- ng-click="addActivity(activitySet, newTimelineActivity); newTimelineActivity = ''" -->
+      <div crm-add-name
+           crm-options="activityTypeNames"
+           crm-var="newActivity"
+           crm-on-add="addActivityType(newActivity)"
+              />
     </td>
   </tr>
   </tbody>

diff --git a/partials/crmCaseType/addName.html b/partials/crmCaseType/addName.html
new file mode 100644 (file)
index 0000000..5850ef6
--- /dev/null
+++ b/partials/crmCaseType/addName.html
@@ -0,0 +1,17 @@
+<!--
+Directive: crmAddName
+-->
+Add:
+<input
+        ui-jq="autocomplete"
+        ui-options="{source:crmOptions}"
+        ng-model="crmVar"
+        class="add-activity"
+        />
+
+<button
+        ng-class="{disabled: (crmVar == '' || crmVar == null)}"
+        ng-disabled="crmVar == '' || crmVar == null"
+        ng-click="crmOnAdd(); crmVar = ''"
+        >Add
+</button>

diff --git a/partials/crmCaseType/pipelineTable.html b/partials/crmCaseType/pipelineTable.html
index 05db80c49f89f160f5b062cb94f8c243c1510e83..87abca204c21d5b0c85fd53874782d773e8a5a32 100644 (file)
--- a/partials/crmCaseType/pipelineTable.html
+++ b/partials/crmCaseType/pipelineTable.html
@@ -19,5 +19,14 @@ Required vars: activitySet
       </a>
     </td>
   </tr>
+  <tr class="addRow">
+    <td colspan="3">
+      <div crm-add-name
+           crm-options="activityTypeNames"
+           crm-var="newActivity"
+           crm-on-add="addActivity(activitySet, newActivity)"
+              />
+    </td>
+  </tr>
   </tbody>
 </table>

diff --git a/partials/crmCaseType/timelineTable.html b/partials/crmCaseType/timelineTable.html
index c44e41253cd4adc8d5f99e4db5a7f8e9a6b9e6c8..743c3fa4e217e4e4834f89f9f2e8802b763c899d 100644 (file)
--- a/partials/crmCaseType/timelineTable.html
+++ b/partials/crmCaseType/timelineTable.html
@@ -44,5 +44,14 @@ Required vars: activitySet
       </a>
     </td>
   </tr>
+  <tr class="addRow">
+    <td colspan="6">
+      <div crm-add-name
+           crm-options="activityTypeNames"
+           crm-var="newActivity"
+           crm-on-add="addActivity(activitySet, newActivity)"
+              />
+    </td>
+  </tr>
   </tbody>
 </table>