Button functioning cleared up

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index ea0ced998b90a17dd87554b23a6c5a5ad632d1f6..fc3e76dffb3239d99034f4a9ae2366ed782da26e 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -30,7 +30,7 @@
             });
 
             $routeProvider.when('/mailing/abtesting', {
             });
 
             $routeProvider.when('/mailing/abtesting', {

-                templateUrl: partialUrl('helloworld.html'),
+                templateUrl: partialUrl('main.html'),

                 controller: 'TabsDemoCtrl',
                 resolve: {
                     metaData: function($route, crmApi) {
                 controller: 'TabsDemoCtrl',
                 resolve: {
                     metaData: function($route, crmApi) {


@@ -52,23 +52,24 @@
         $scope.groups = metaData.values;
         $scope.mailings = mailingList.values;
         $scope.tab_val=0;
         $scope.groups = metaData.values;
         $scope.mailings = mailingList.values;
         $scope.tab_val=0;

+        $scope.max_tab=0;

         $scope.campaign_clicked= function(){
         $scope.campaign_clicked= function(){

-            if($scope.tab_val >= 0 ){
+            if($scope.max_tab >= 0 ){

                 $scope.tab_val  =0;
             }
         };
         $scope.compose_clicked=function(){
                 $scope.tab_val  =0;
             }
         };
         $scope.compose_clicked=function(){

-            if($scope.tab_val >=1){
+            if($scope.max_tab >=1){

                 $scope.tab_val =1;
             }
         };
         $scope.rec_clicked=function(){
                 $scope.tab_val =1;
             }
         };
         $scope.rec_clicked=function(){

-            if($scope.tab_val >=2){
+            if($scope.max_tab >=2){

                 $scope.tab_val =2;
             }
         };
         $scope.preview_clicked=function(){
                 $scope.tab_val =2;
             }
         };
         $scope.preview_clicked=function(){

-            if($scope.tab_val>=3){
+            if($scope.max_tab>=3){

                 $scope.tab_val=3;
             }
         };
                 $scope.tab_val=3;
             }
         };


@@ -111,6 +112,7 @@
         return {
             // Restrict it to be an attribute in this case
             restrict: 'A',
         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) {
             priority: 500,
             // responsible for registering DOM listeners as well as updating the DOM
             link: function(scope, element, attrs) {


@@ -121,12 +123,15 @@
 
                 $(element).on("click",function() {
                     scope.tab_val=scope.tab_val +1;
 
                 $(element).on("click",function() {
                     scope.tab_val=scope.tab_val +1;

+
+                    scope.max_tab= Math.max(scope.tab_val,scope.max_tab);

                     var myArray1 = new Array(  );
                     var myArray1 = new Array(  );

-                    for ( var i = scope.tab_val+1; i < 4; i++ ) {
+                    for ( var i = scope.max_tab+1; i < 4; i++ ) {

                         myArray1.push(i);
                     }
                     $(element).parent().parent().parent().parent().parent().tabs( "option", "disabled", myArray1 );
                         myArray1.push(i);
                     }
                     $(element).parent().parent().parent().parent().parent().tabs( "option", "disabled", myArray1 );

-                    $(element).parent().parent().parent().parent().parent().tabs({active:scope.tab_val});
+                    $(element).parent().parent().parent().parent().parent().tabs("option", "active", scope.tab_val);
+                    scope.$apply();

                     console.log("Adir");
                 });
             }
                     console.log("Adir");
                 });
             }


@@ -144,10 +149,19 @@
 
 
                 $(element).on("click",function() {
 
 
                 $(element).on("click",function() {

+                    var temp= scope.tab_val -1 ;

                     scope.tab_val=scope.tab_val -1;
 
                     scope.tab_val=scope.tab_val -1;
 

-                    $(element).parent().parent().parent().parent().parent().tabs({active:scope.tab_val});
-                    console.log("Adir");
+                    console.log(temp);
+                    if(temp==3){
+
+                    }
+                    else {
+                        $(element).parent().parent().parent().parent().parent().tabs("option", "active", temp);
+                    }
+
+                    scope.$apply();
+

                 });
             }
         };
                 });
             }
         };

diff --git a/partials/abtesting/helloworld.html b/partials/abtesting/main.html
similarity index 96%
rename from partials/abtesting/helloworld.html
rename to partials/abtesting/main.html
index 0d831e464cf62ab1bc94c5b90fd570de18e43a49..69a416129d3d9ebb304d879e92ae2f001ca197f3 100644 (file)
--- a/partials/abtesting/helloworld.html
+++ b/partials/abtesting/main.html
@@ -1,4 +1,8 @@
+
+

 <div>
 <div>

+
+    {{tab_val}}

     <div ui-jq="tabs" id="alltabs" >
         <ul>
 
     <div ui-jq="tabs" id="alltabs" >
         <ul>
 


@@ -131,10 +135,11 @@
             &nbsp &nbsp <input type="text" datepick class = "dateplugin" ng-show="start=='later'" ng-model="send_date" >
             </div>
             <br><br>
             &nbsp &nbsp <input type="text" datepick class = "dateplugin" ng-show="start=='later'" ng-model="send_date" >
             </div>
             <br><br>

-            <div prevbutton></div><div class="crm-submit-buttons" id="campaignbutton">
+            <div>
+            <div style="position:relative; left:200px; top:30px;" prevbutton></div><div class="crm-submit-buttons"  style="position:relative; left:300px;">

             <div class = "crm-button crm-button-type-upload crm-button_qf_Contact_upload_view"   >
                 <input type="submit" value="Submit & Send"  id="campaignbutton _qf_Contact_upload_view-top" class="btn btn-primary" nexttab={{tab_val}}>
             <div class = "crm-button crm-button-type-upload crm-button_qf_Contact_upload_view"   >
                 <input type="submit" value="Submit & Send"  id="campaignbutton _qf_Contact_upload_view-top" class="btn btn-primary" nexttab={{tab_val}}>

-                </div></div>
+                </div></div></div>

 
         </div>
     </div>
 
         </div>
     </div>