From: aditya-nambiar <aditya.nambiar007@gmail.com>
Date: Wed, 18 Jun 2014 18:58:17 +0000 (-0400)
Subject: Mailing db updateb in all 3 cases
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d340146d44effedcc2af7f97820b00174cfcc6cf;p=civicrm-core.git

Mailing db updateb in all 3 cases
---

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 48e884e22b..5e8afbb8f0 100644
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -11,6 +11,12 @@
 
     var crmMailingAB = angular.module('crmMailingAB', ['ngRoute', 'ui.utils']);
 
+    crmMailingAB.run(function($rootScope, $templateCache) {
+        $rootScope.$on('$viewContentLoaded', function() {
+            $templateCache.removeAll();
+        });
+    });
+
     crmMailingAB.config(['$routeProvider',
         function($routeProvider) {
             $routeProvider.when('/mailing', {
@@ -84,12 +90,28 @@
 
         $scope.send_date ="10/4/2004";
 
+        $scope.mailA={};
+
+        $scope.mailB={};
+        $scope.save=function(dat){
+
+            var result= crmApi('Mailing', 'create',dat, true);
+            console.log("Ac "+result);
+        };
+
+        $scope.init=function(par){
+
+            $scope.whatnext=par.toString()
+        }
+
+
     });
 
     crmMailingAB.directive('nexttab', function() {
         return {
             // Restrict it to be an attribute in this case
             restrict: 'A',
+            priority: 500,
             // responsible for registering DOM listeners as well as updating the DOM
             link: function(scope, element, attrs) {
 
@@ -102,11 +124,10 @@
                     var myArray1 = new Array(  );
                     for ( var i = scope.tab_val+1; i < 4; i++ ) {
                         myArray1.push(i);
-                        console.log( "try " + i );
                     }
                     $(element).parent().parent().parent().tabs( "option", "disabled", myArray1 );
                     $(element).parent().parent().parent().tabs({active:scope.tab_val});
-                    console.log("adiroxxx");
+                    console.log("Adir");
                 });
             }
         };
@@ -188,4 +209,54 @@
             }
         };
     });
+
+    crmMailingAB.directive('submitform',function(){
+        return {
+          restrict:'A',
+            priority: 1000,
+          link: function(scope,element,attrs){
+              $(element).on("click",function() {
+
+                  console.log("clicked");
+                  scope.save({
+                      "sequential": 1,
+                       "name": "Aditya Nambiar",
+                      "subject": scope.mailA.subj,
+                      "created_id": "2",
+                      "from_email": scope.mailA.fromEmail,
+                      "body_text": scope.mailA.body
+
+                  });
+                  console.log("Truth "+ scope.whatnext)
+
+                  if(scope.whatnext=="3"){
+                      console.log("sdf");
+                      scope.mailB.subj=scope.mailA.subj;
+                      scope.mailB.body=scope.mailA.body;
+
+                  }
+                  else if(scope.whatnext=="2"){
+                      scope.mailB.fromEmail=scope.mailA.fromEmail;
+                      scope.mailB.body=scope.mailA.body;
+
+                  }
+                  
+
+                  scope.save({
+                      "sequential": 1,
+                      "name": "Aditya Nambiar",
+                      "subject": scope.mailB.subj,
+                      "created_id": "2",
+                      "from_email": scope.mailB.fromEmail,
+                      "body_text": scope.mailB.body
+
+                  });
+
+              });
+          }
+        };
+
+    });
+
+
 })(angular, CRM.$, CRM._);
\ No newline at end of file
diff --git a/partials/abtesting/from_name.html b/partials/abtesting/from_name.html
index 1c22cc02de..90455b8181 100644
--- a/partials/abtesting/from_name.html
+++ b/partials/abtesting/from_name.html
@@ -4,16 +4,17 @@
     <br><br>
     <pre>
 
-        From Email Address A: <input type="text"><br>
-        From Email Address B: <input type="text"><br>
+        From Email Address A: <input type="text" ng-model="mailA.fromEmail"><br>
+        From Email Address B: <input type="text" ng-model="mailB.fromEmail"><br>
         Use Template : <input type="text"><br>
-        Mail Subject: <input type="text"><br>
+        Mail Subject: <input type="text" ng-model="mailA.subj" ><br>
 
-        <textarea rows="4" cols="50">
+        <textarea rows="4" cols="50" ng-model="mailA.body" >
 
         </textarea>
 
 
+        <span ng-init="init('3')" ></span>
 
     </pre>
 </div>
\ No newline at end of file
diff --git a/partials/abtesting/helloworld.html b/partials/abtesting/helloworld.html
index f7c08a4e09..9b57e092ed 100644
--- a/partials/abtesting/helloworld.html
+++ b/partials/abtesting/helloworld.html
@@ -25,7 +25,8 @@
             <form>
             <div  ng-include="template.url">
             </div>
-            <button  id="campaignbutton" nexttab={{adi}} >Done</button><br>
+                gghvjhkv
+            <button  id="campaignbutton" submitform={{whatnext}} nexttab={{adi}} >Done</button><br>
             </form>
         </div>
 
diff --git a/partials/abtesting/subject_lines.html b/partials/abtesting/subject_lines.html
index 4522eb2923..c44a656783 100644
--- a/partials/abtesting/subject_lines.html
+++ b/partials/abtesting/subject_lines.html
@@ -4,15 +4,16 @@
     <br><br>
     <pre>
 
-        From Email Address: <input type="text"><br>
+        From Email Address: <input type="text" ng-model="mailA.fromEmail"><br>
         Use Template : <input type="text"><br>
-        Mail Subject A: <input type="text"><br>
-        Mail Subject B: <input type="text"><br>
+        Mail Subject A: <input type="text" ng-model="mailA.subj"><br>
+        Mail Subject B: <input type="text" ng-model="mailB.subj"><br>
 
-        <textarea rows="4" cols="50">
+        <textarea rows="4" cols="50" ng-model="mailA.body">
 
         </textarea>
 
+        <span ng-init="init('2')" ></span>
 
 
     </pre>
diff --git a/partials/abtesting/two_emails.html b/partials/abtesting/two_emails.html
index 1e09b7f6ac..c5252d4322 100644
--- a/partials/abtesting/two_emails.html
+++ b/partials/abtesting/two_emails.html
@@ -8,22 +8,22 @@
       </ul>
 
       <div id="tabs-21">
-          From Email Address : <input type="text"><br>
-          Use Template : <input type="text"><br>
-          Mail Subject: <input type="text"><br>
+          From Email Address : <input type="text" ng-model="mailA.fromEmail"><br>
+          Use Template : <input type="text" ><br>
+          Mail Subject: <input type="text" ng-model="mailA.subj"><br>
 
-          <textarea rows="4" cols="50">
+          <textarea rows="4" cols="50" ng-model="mailA.body">
 
           </textarea>
 
 
       </div>
       <div id="tabs-22">
-          From Email Address : <input type="text"><br>
+          From Email Address : <input type="text" ng-model="mailB.fromEmail"><br>
           Use Template : <input type="text"><br>
-          Mail Subject: <input type="text"><br>
+          Mail Subject: <input type="text" ng-model="mailB.subj"><br>
 
-          <textarea rows="4" cols="50">
+          <textarea rows="4" cols="50" ng-model="mailB.body">
 
           </textarea>
 
@@ -33,4 +33,5 @@
   </div>
 
 
+
 </div>
\ No newline at end of file