Merge pull request #9 from thesedateone/revert-8-feature/manual_queuing

Revert "Feature/manual queuing"

assets/js/call/app.js → assets/js/app.js

@@ -10,17 +10,13 @@ ecApp.config(['$routeProvider',
   function($routeProvider) {
     $routeProvider.
       when('/ready', {
-        templateUrl: djangoStatic + 'partials/call/ready.html',
+        templateUrl: djangoStatic + 'partials/ready.html',
         controller: 'readyCtrl'
       }).
       when('/call/:callCat', {
-        templateUrl: djangoStatic + 'partials/call/call.html',
+        templateUrl: djangoStatic + 'partials/call.html',
         controller: 'callCtrl'
       }).
-      when('/call/:callCat/empty', {
-        templateUrl: djangoStatic + 'partials/call/call_empty.html',
-        controller: 'callEmptyCtrl'
-      }).
       otherwise({
         redirectTo: '/ready'
       });

assets/js/call/controllers.js → assets/js/controllers.js

@@ -4,27 +4,19 @@ var ecAppControllers = angular.module('ecAppControllers', ['restangular']);
 
 
 ecAppControllers.controller('readyCtrl', 
-  ['$scope', 'Restangular',
-  function($scope, Restangular) {
+  ['$scope', 'Restangular', '$q',
+  function($scope, Restangular, $q) {
+    'use strict';
+
     Restangular.all('list_types/').getList().then(function(types) {
       $scope.types = types;
     });
   }]);
 
 
-ecAppControllers.controller('callEmptyCtrl', 
-  ['$scope', '$routeParams', 'Restangular',
-  function($scope, $routeParams, Restangular) {
-    Restangular.one('list_types/' + $routeParams.callCat + '/').get().then(
-      function(callType) {
-        $scope.callType = callType;
-    });
-  }]);
-
-
 ecAppControllers.controller('callCtrl', 
-  ['$scope', '$routeParams', 'Restangular', '$q', '$window',
-  function($scope, $routeParams, Restangular, $q, $window) {
+  ['$scope', '$routeParams', 'Restangular', '$q',
+  function($scope, $routeParams, Restangular, $q) {
     'use strict';
 
     Restangular.one('list_types/' + $routeParams.callCat + '/').get().then(
@@ -43,7 +35,6 @@ ecAppControllers.controller('callCtrl',
         }, function (response) {
           console.log("Error with status code", response.status);
           deferred.reject();
-          $window.location.href = '#/call/' + $routeParams.callCat + '/empty';
         });
 
       return deferred.promise;

assets/js/call/directives.js → assets/js/directives.js

@@ -230,26 +230,15 @@ ecAppDirectives.directive('ecResultSection', function() {
     },
     template:
       '<ec-result-input-list call="call"></ec-result-input-list>' +
-      '<div class="row buttons">' +
-      '  <div class="col-xs-4" ng-repeat="button in buttons">' +
-      '    <a ec-action-button linkfunc="submit(button)" data="button"></a>' +
-      '  </div> ' +
-      '</div>' +
-      '<div class="row buttons">' +
-      '  <div class="col-xs-6">' +
-      '    <a class="btn btn-block btn-primary" ng-click="next()" role="button">Next</a>' +
-      '  </div>' +
-      '  <div class="col-xs-6">' +
-      '    <a class="btn btn-block btn-primary" href="#/ready" role="button">Break</a>' +
-      '  </div>' +
-      '</div>',
+      '<ul>' +
+      '  <li ng-repeat="button in buttons">' +
+      '    <a ec-action-button data="submit(button)" label="{{button}}"></a>' +
+      '  </li> ' +
+      '</ul>',
 
     link: function (scope, element, attrs) {
       scope.submit = function(button) {
-        scope.updatefunc({'button': button.display_name, 'data': scope.call});
-      };
-      scope.next = function() {
-        scope.updatefunc({'button': 'Next', 'data': scope.call});
+        scope.updatefunc({'button': button, 'data': scope.call});
       };
     }
   };
@@ -260,31 +249,13 @@ ecAppDirectives.directive('ecActionButton', function() {
   return {
     restrict: "A",
     scope: {
-      linkfunc: "&",
-      data: "=",
+      data: "&",
+      label: "@",
     },
     template: '<a ' +
-      'ng-class="btnclass(data.category)" role="button" ng-click="linkfunc()">' +
-      '{{data.display_name}}' +
-      '</a>',
-
-    link: function (scope) {
-      scope.btnclass = function(cat) {
-        var base = "btn btn-block btn-md ";
-        if (cat === "gd") {
-          var result = base.concat("btn-success");
-        } else if (cat === "bd") {
-          var result = base.concat("btn-danger");
-        } else if (cat === "nt") {
-          var result = base.concat("btn-default");
-        } else if (cat === "ic") {
-          var result = base.concat("btn-primary");
-        } else {
-          var result = base;
-        };
-        return result;
-      };
-    }
+      'class="btn btn-md btn-default" role="button" ng-click="data()">' +
+      '{{label}}' +
+      '</a>'
   };
 });