Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
erp5
Commits
a0a543f8
Commit
a0a543f8
authored
6 years ago
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_core] Jio Release 3.28.0
/reviewed-on
nexedi/erp5!626
parent
99ca7eed
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
62 additions
and
43 deletions
+62
-43
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
...p5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
+62
-43
No files found.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
View file @
a0a543f8
...
...
@@ -6308,33 +6308,52 @@ return new Parser;
/**
* A sort function to sort items by key
*
* @param {String} key The key to sort on
* @param {String} [way="ascending"] 'ascending' or 'descending'
* @param {Array} sort_list List of couples [key, direction]
* @return {Function} The sort function
*/
function
sortFunction
(
key
,
way
,
key_schema
)
{
var
result
,
cast_to
;
if
(
way
===
'
descending
'
)
{
result
=
1
;
}
else
if
(
way
===
'
ascending
'
)
{
result
=
-
1
;
}
else
{
throw
new
TypeError
(
"
Query.sortFunction():
"
+
"
Argument 2 must be 'ascending' or 'descending'
"
);
}
if
(
key_schema
!==
undefined
&&
key_schema
.
key_set
!==
undefined
&&
key_schema
.
key_set
[
key
]
!==
undefined
&&
key_schema
.
key_set
[
key
].
cast_to
!==
undefined
)
{
if
(
typeof
key_schema
.
key_set
[
key
].
cast_to
===
"
string
"
)
{
cast_to
=
key_schema
.
cast_lookup
[
key_schema
.
key_set
[
key
].
cast_to
];
function
generateSortFunction
(
key_schema
,
sort_list
)
{
return
function
sortByMultipleIndex
(
a
,
b
)
{
var
result
,
cast_to
,
key
=
sort_list
[
0
][
0
],
way
=
sort_list
[
0
][
1
],
i
,
l
,
a_string_array
,
b_string_array
,
f_a
,
f_b
,
tmp
;
if
(
way
===
'
descending
'
)
{
result
=
1
;
}
else
if
(
way
===
'
ascending
'
)
{
result
=
-
1
;
}
else
{
cast_to
=
key_schema
.
key_set
[
key
].
cast_to
;
throw
new
TypeError
(
"
Query.sortFunction():
"
+
"
Argument 2 must be 'ascending' or 'descending'
"
);
}
return
function
(
a
,
b
)
{
var
f_a
=
cast_to
(
a
[
key
]),
f_b
=
cast_to
(
b
[
key
]);
if
(
key_schema
!==
undefined
&&
key_schema
.
key_set
!==
undefined
&&
key_schema
.
key_set
[
key
]
!==
undefined
&&
key_schema
.
key_set
[
key
].
cast_to
!==
undefined
)
{
if
(
typeof
key_schema
.
key_set
[
key
].
cast_to
===
"
string
"
)
{
cast_to
=
key_schema
.
cast_lookup
[
key_schema
.
key_set
[
key
].
cast_to
];
}
else
{
cast_to
=
key_schema
.
key_set
[
key
].
cast_to
;
}
f_a
=
cast_to
(
a
[
key
]);
f_b
=
cast_to
(
b
[
key
]);
if
(
typeof
f_b
.
cmp
===
'
function
'
)
{
return
result
*
f_b
.
cmp
(
f_a
);
tmp
=
result
*
f_b
.
cmp
(
f_a
);
if
(
tmp
!==
0
)
{
return
tmp
;
}
if
(
sort_list
.
length
>
1
)
{
return
generateSortFunction
(
key_schema
,
sort_list
.
slice
(
1
))(
a
,
b
);
}
return
tmp
;
}
if
(
f_a
>
f_b
)
{
return
-
result
;
...
...
@@ -6342,30 +6361,35 @@ return new Parser;
if
(
f_a
<
f_b
)
{
return
result
;
}
if
(
sort_list
.
length
>
1
)
{
return
generateSortFunction
(
key_schema
,
sort_list
.
slice
(
1
))(
a
,
b
);
}
return
0
;
};
}
return
function
(
a
,
b
)
{
}
// this comparison is 5 times faster than json comparison
var
i
,
l
;
a
=
metadataValueToStringArray
(
a
[
key
])
||
[];
b
=
metadataValueToStringArray
(
b
[
key
])
||
[];
l
=
a
.
length
>
b
.
length
?
a
.
length
:
b
.
length
;
a_string_array
=
metadataValueToStringArray
(
a
[
key
])
||
[];
b_string_array
=
metadataValueToStringArray
(
b
[
key
])
||
[];
l
=
Math
.
max
(
a_string_array
.
length
,
b_string_array
.
length
);
for
(
i
=
0
;
i
<
l
;
i
+=
1
)
{
if
(
a
[
i
]
===
undefined
)
{
if
(
a
_string_array
[
i
]
===
undefined
)
{
return
result
;
}
if
(
b
[
i
]
===
undefined
)
{
if
(
b
_string_array
[
i
]
===
undefined
)
{
return
-
result
;
}
if
(
a
[
i
]
>
b
[
i
])
{
if
(
a
_string_array
[
i
]
>
b_string_array
[
i
])
{
return
-
result
;
}
if
(
a
[
i
]
<
b
[
i
])
{
if
(
a
_string_array
[
i
]
<
b_string_array
[
i
])
{
return
result
;
}
}
if
(
sort_list
.
length
>
1
)
{
return
generateSortFunction
(
key_schema
,
sort_list
.
slice
(
1
))(
a
,
b
);
}
return
0
;
};
}
...
...
@@ -6378,19 +6402,14 @@ return new Parser;
* @return {Array} The filtered list
*/
function
sortOn
(
sort_on_option
,
list
,
key_schema
)
{
var
sort_index
;
if
(
!
Array
.
isArray
(
sort_on_option
))
{
throw
new
TypeError
(
"
jioquery.sortOn():
"
+
"
Argument 1 is not of type 'array'
"
);
}
for
(
sort_index
=
sort_on_option
.
length
-
1
;
sort_index
>=
0
;
sort_index
-=
1
)
{
list
.
sort
(
sortFunction
(
sort_on_option
[
sort_index
][
0
],
sort_on_option
[
sort_index
][
1
],
key_schema
));
}
list
.
sort
(
generateSortFunction
(
key_schema
,
sort_on_option
));
return
list
;
}
...
...
@@ -6756,7 +6775,7 @@ return new Parser;
* @param {String} spec.value The value of the metadata to compare
*/
function
ComplexQuery
(
spec
,
key_schema
)
{
Query
.
call
(
this
);
Query
.
call
(
this
,
key_schema
);
/**
* Logical operator to use to compare object values
...
...
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