Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
cdek-warehouse
Commits
cbb4a542
Commit
cbb4a542
authored
8 years ago
by
Denis Zaykov
Browse files
Options
Download
Email Patches
Plain Diff
CDEK-1497: Bugfixing for ci dialog and "+" button.
parent
e15114f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
front/cdek_front/src/main/webapp/WEB-INF/views/warehouse/add_correction_income.ftl
+1
-1
.../webapp/WEB-INF/views/warehouse/add_correction_income.ftl
front/cdek_front/src/main/webapp/commons/stylesheets/main.css
+5
-0
...t/cdek_front/src/main/webapp/commons/stylesheets/main.css
front/cdek_front/src/main/webapp/warehouse-angular/application/add_correction_income.js
+13
-8
...pp/warehouse-angular/application/add_correction_income.js
with
19 additions
and
9 deletions
+19
-9
front/cdek_front/src/main/webapp/WEB-INF/views/warehouse/add_correction_income.ftl
View file @
cbb4a542
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
front/cdek_front/src/main/webapp/commons/stylesheets/main.css
View file @
cbb4a542
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
front/cdek_front/src/main/webapp/warehouse-angular/application/add_correction_income.js
View file @
cbb4a542
...
...
@@ -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
);
};
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help