Commit cbb4a542 authored by Denis Zaykov's avatar Denis Zaykov
Browse files

CDEK-1497: Bugfixing for ci dialog and "+" button.

parent e15114f6
Showing with 19 additions and 9 deletions
+19 -9
......@@ -175,7 +175,7 @@
ng-disabled="!sked.warehouse || !sked.employeeIn || !sked.employeeOut">
</div>
<button type="submit" class="btn btn-primary" ng-click="verifyOrder(orderNumber)"
ng-disabled="!sked.warehouse || !sked.employeeIn || !sked.employeeOut"><span
ng-disabled="!sked.warehouse || !sked.employeeIn || !sked.employeeOut || !orderNumber"><span
class="glyphicon glyphicon-plus"
aria-hidden="true"></span></button>
</form>
......
......@@ -250,6 +250,11 @@ input.ng-invalid-has-errors {
font-size: 11px;
}
#confirmDialog .dialog-body{
max-height: 30vh;
overflow-y: auto;
}
.dialog-body {
padding-left:25px;
padding-right:25px;
......
......@@ -5,9 +5,19 @@ app.controller('AddCorrectionCtrl', function($scope, $routeParams, $timeout, $lo
$scope.config = config;
$scope.barcode = null;
var confirmDialog;
$timeout(function () {
skedService.initFloatingRow($scope.orderListApi.gridOptions);
confirmDialog = $('#confirmDialog').dialog({
width: 600,
modal: true,
draggable: true,
resizable: false,
autoOpen: false
});
});
......@@ -44,20 +54,15 @@ app.controller('AddCorrectionCtrl', function($scope, $routeParams, $timeout, $lo
}, $scope.orderListApi, function errorCallback(response) {
}, function successCallback(response){
$scope.verifyResult = response.data;
$('#confirmDialog').dialog({
width: 600,
modal: true,
draggable: true,
resizable: false
});
$(confirmDialog).dialog("open");
});
};
$scope.closeConfirmDialog=function(){
$('#confirmDialog').dialog('close');
$(confirmDialog).dialog('close');
};
$scope.confirmAddOrder=function(){
$('#confirmDialog').dialog('close');
$(confirmDialog).dialog('close');
$scope.addOrder($scope.barcode);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment