CRM-15578 - crmMailingAB2 - Add testing_criteria_id

diff --git a/js/angular-crmMailingAB2.js b/js/angular-crmMailingAB2.js
index 0bd3f7b545398e63bd6016e2a934af7794da4a6f..8805dca3cf9399e3a42f9d19207a6bc8810cf531 100644 (file)
--- a/js/angular-crmMailingAB2.js
+++ b/js/angular-crmMailingAB2.js
@@ -42,6 +42,8 @@
   angular.module('crmMailingAB2').controller('CrmMailingAB2EditCtrl', function ($scope, abtest, crmMailingABCriteria, crmMailingMgr) {
     $scope.abtest = abtest;
     $scope.ts = CRM.ts('CiviMail');
+    $scope.crmMailingABCriteria = crmMailingABCriteria;
+
     $scope.sync = function sync() {
       abtest.mailings.a.name = ts('Test A (%1)', {1: abtest.ab.name});
       abtest.mailings.b.name = ts('Test B (%1)', {1: abtest.ab.name});

diff --git a/partials/crmMailingAB2/edit.html b/partials/crmMailingAB2/edit.html
index 42b3d14ffecb3f0c3f8364d9f38aba128a79300d..09c6763311bb2bc7b5c24c682c1e74b6cedb1e09 100644 (file)
--- a/partials/crmMailingAB2/edit.html
+++ b/partials/crmMailingAB2/edit.html
@@ -3,18 +3,37 @@
 </div>
 
 <form name="crmMailingAB2">
-  <div crm-ui-wizard>
-    <div crm-ui-wizard-step crm-title="ts('Setup')">
-      Name: <input ng-model="abtest.ab.name"/>
-    </div>
-    <div crm-ui-wizard-step crm-title="ts('Content')">
-      <div>
-        Subject A: <input ng-model="abtest.mailings.a.subject"/>
+  <div class="crm-block crm-form-block crmMailing2">
+    <div crm-ui-wizard>
+      <div crm-ui-wizard-step crm-title="ts('Setup')">
+        <div ng-form="setupForm" crm-ui-id-scope>
+          <div>
+            <label crm-ui-for="setupForm.abName">{{ts('What would you like to name the test?')}}</label>
+          </div>
+          <div>
+            <input ng-model="abtest.ab.name" name="abName" crm-ui-id="setupForm.abName" required/>
+          </div>
+
+          <div>
+            <label>{{ts('What would you like to test?')}}</label>
+          </div>
+          <div ng-repeat="criteria in crmMailingABCriteria.getAll()">
+            <label>
+              <input name="testing_critiria" ng-model="abtest.ab.testing_criteria_id" type="radio"
+                     value="{{criteria.value}}" required/>
+              {{criteria.label}}
+            </label>
+          </div>
+        </div>
       </div>
-      <div>
-        Subject B: <input ng-model="abtest.mailings.b.subject"/>
+      <div crm-ui-wizard-step crm-title="ts('Content')">
+        <div>
+          Subject A: <input ng-model="abtest.mailings.a.subject"/>
+        </div>
+        <div>
+          Subject B: <input ng-model="abtest.mailings.b.subject"/>
+        </div>
       </div>
-    </div>
     <span crm-ui-wizard-buttons style="float:right;">
       <button
         crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}"
@@ -22,5 +41,6 @@
       </button>
       <button ng-click="save()">{{ts('Save Draft')}}</button>
     </span>
+    </div>
   </div>
 </form>