diff --git a/assets/linker/js/controllers/update-order-controller.coffee b/assets/linker/js/controllers/update-order-controller.coffee index f66ec66..01af34e 100644 --- a/assets/linker/js/controllers/update-order-controller.coffee +++ b/assets/linker/js/controllers/update-order-controller.coffee @@ -22,6 +22,12 @@ lunchControllers.controller 'UpdateOrderCtrl', ['$scope','socket','$routeParams' $scope.invitees = allResponse $scope.$apply() + socket.on 'message', (m) -> + if m.verb is 'update' and m.data.run_id is $scope.run.id + invitee = _.findWhere $scope.invitees, run_id: m.data.run_id + _.extend invitee, m.data + $scope.$apply() + $scope.submit = (invitee) -> socket.put '/invitee/' + $routeParams['inviteeId'], { order: invitee.order }, (response) -> $location.path '/run/' + $scope.run.id diff --git a/assets/linker/styles/update-order.less b/assets/linker/styles/update-order.less index 9bef616..27d74a6 100644 --- a/assets/linker/styles/update-order.less +++ b/assets/linker/styles/update-order.less @@ -1,6 +1,6 @@ .others-orders { .list-group-item { - border-width: 0 0 1px 0; + border-width: 0; background-color: transparent; } } diff --git a/assets/linker/templates/invitee/update-order.jade b/assets/linker/templates/invitee/update-order.jade index 926db94..f32ced2 100644 --- a/assets/linker/templates/invitee/update-order.jade +++ b/assets/linker/templates/invitee/update-order.jade @@ -18,21 +18,22 @@ block interiorcontent div.form-group textarea#order.form-control(ng-model='invitee.order',placeholder='Your order',rows=8) - button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Submit Order + button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Update Order .col-xs-12.col-sm-6 - div.pod(ng-show='showMenuUrl') - h2 - | Menu - a.btn.btn-sm.btn-default.pull-right(href='{{ run.menuUrl }}',target='_blank') - span.glyphicon.glyphicon-new-window - - iframe(ng-src='{{ menuUrl }}',width='100%',height='400px') - div.pod.others-orders h2 Other's orders ul.list-group(ng-repeat='i in invitees') li.list-group-item + span.glyphicon.glyphicon-user + |   strong {{ i.name }} | : {{ i.order }} + div(ng-show='showMenuUrl') + h2 + | Menu + a.btn.btn-sm.btn-default.pull-right(href='{{ run.menuUrl }}',target='_blank') + span.glyphicon.glyphicon-new-window + + iframe(ng-src='{{ menuUrl }}',width='100%',height='400px')