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
transport-schema
Commits
a3fd71eb
Commit
a3fd71eb
authored
8 years ago
by
njrfhtd
Browse files
Options
Download
Email Patches
Plain Diff
batchUpdate bugfix
parent
3e3c8143
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
TransportSchema_Front/app/viewSchema/viewSchema.js
+2
-1
TransportSchema_Front/app/viewSchema/viewSchema.js
TransportSchema_Front/app/viewSchemaList/viewSchemaList.js
+11
-4
TransportSchema_Front/app/viewSchemaList/viewSchemaList.js
with
13 additions
and
5 deletions
+13
-5
TransportSchema_Front/app/viewSchema/viewSchema.js
View file @
a3fd71eb
...
...
@@ -1457,7 +1457,7 @@ function ViewSchemaCtrl($timeout, $scope, $http, $routeParams, $popover, $alert,
schema
.
days
[
dataItem
.
weekDay
].
push
(
dataItem
);
}
console
.
log
(
"
vm.schema.days:
"
,
vm
.
schema
.
days
);
console
.
log
(
"
vm.schema.days:
"
,
schema
.
days
);
for
(
var
i
=
0
;
i
<
vm
.
dayOfWeekArray
.
length
;
i
++
)
{
schema
.
days
[
vm
.
dayOfWeekArray
[
i
]].
sort
(
compareItems
);
...
...
@@ -1465,6 +1465,7 @@ function ViewSchemaCtrl($timeout, $scope, $http, $routeParams, $popover, $alert,
schema
.
multiEdit
=
angular
.
copy
((
schemaGridService
.
gridSelectedRowsNodes
.
length
>
1
));
schema
.
selectedSchemas
=
angular
.
copy
(
schemaGridService
.
gridSelectedRowsNodes
);
console
.
info
(
"
vm.schema.selectedSchemas:
"
,
schema
.
selectedSchemas
);
return
schema
;
}
...
...
This diff is collapsed.
Click to expand it.
TransportSchema_Front/app/viewSchemaList/viewSchemaList.js
View file @
a3fd71eb
...
...
@@ -529,7 +529,7 @@ function ViewSchemaListCtrl($timeout, $scope, $http, $alert, $window, $location,
});
vm
.
fillSelectedRowsNodes
();
vm
.
multiSelectListener
();
console
.
info
(
"
onSelectionChanged : vm.selectedSchemas:
"
,
vm
.
selectedSchemas
);
//+++
console.info("onSelectionChanged : vm.selectedSchemas:", vm.selectedSchemas);
}
});
},
...
...
@@ -794,6 +794,8 @@ function ViewSchemaListCtrl($timeout, $scope, $http, $alert, $window, $location,
//++++TEST 29.09.2016++if (schemaGridService.gridSelectedRowsNodesTEST[i].id == someNode.data.id && schemaGridService.gridSelectedRowsNodesTEST[i].id != 0) {
if
(
schemaGridService
.
gridSelectedRowsNodesTEST
[
i
].
uid
==
someNode
.
id
&&
schemaGridService
.
gridSelectedRowsNodesTEST
[
i
].
uid
!=
0
)
{
someNode
.
setSelected
(
true
);
//console.info("someNode.setSelected(true):", someNode);
schemaGridService
.
gridSelectedRowsNodesTEST
[
i
]
=
someNode
.
data
;
break
;
}
}
...
...
@@ -814,10 +816,15 @@ function ViewSchemaListCtrl($timeout, $scope, $http, $alert, $window, $location,
}
});
vm
.
fillSelectedRowsNodes
();
vm
.
multiSelectListener
();
//TEST+++
vm
.
fillSelectedRowsNodes
();
vm
.
multiSelectListener
();
//+++schemaGridService.gridSelectedRowsNodes = schemaGridService.gridSelectedRowsNodesTEST;
//+++vm.selectedSchemas = schemaGridService.gridSelectedRowsNodes;
//+++vm.selectedExistAndNonExistSchemas = vm.checkSelectedExistAndNonExistSchemas(vm.selectedSchemas);
//TEST+++
/*+++*/
/*+++*/
// });
},
function
errorCallback
(
response
)
{
vm
.
gridOptions
.
api
.
hideOverlay
();
...
...
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