Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
b5e87b87
Commit
b5e87b87
authored
May 12, 2020
by
Benjamin Rousselière
Committed by
Benjamin Rousselière
Aug 03, 2020
Browse files
feat/13541 : add possibility to choose multiple types
parent
a790a7c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/presentation/maarchRM/Resources/locale/fr/recordsManagement/messages.po
View file @
b5e87b87
...
...
@@ -947,6 +947,9 @@ msgstr "Aucun résultat"
msgid "Sub-archive of"
msgstr "Sous-archive de"
msgid "Sub-archive"
msgstr "Sous-archive"
msgid "Zip container"
msgstr "Fichier conteneur"
...
...
@@ -1304,3 +1307,6 @@ msgstr "Date et heure de la validation"
msgid "Masterdata"
msgstr "Référentiel des personnes et organisations"
msgid "Object"
msgstr "Objet"
\ No newline at end of file
src/presentation/maarchRM/Resources/view/recordsManagement/archive/fulltextSearchForm.html
View file @
b5e87b87
...
...
@@ -47,20 +47,6 @@
<input
type=
"text"
data-range=
'end'
class=
"form-control input-sm datePicker col-md-6"
name=
"originatingDateMax"
/>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-md-3 control-label text-primary"
><small>
Type d'objet
</small></label>
<div
class=
"btn-group col-md-4"
style=
"padding-left: 0; padding-right: 0;"
id=
"objectType"
data-toggle=
"buttons"
>
<label
class=
"btn btn-default col-sm-4"
title=
"Tout"
>
<input
class=
"form-control"
type=
"radio"
name=
"hasParent"
value=
""
checked
/>
Tout
</label>
<label
class=
"btn btn-default btn-info active col-sm-4"
title=
"Archive"
>
<input
class=
"form-control"
type=
"radio"
name=
"hasParent"
value=
"0"
checked
/>
Archive
</label>
<label
class=
"btn btn-default col-sm-4"
title=
"Objet d'archive"
>
<input
class=
"form-control"
type=
"radio"
name=
"hasParent"
value=
"1"
/>
Objet
</label>
</div>
</div>
<?merge userArchivalProfiles ?>
<div
class=
"profileAdvanceSearch [?merge .reference ?] hide"
>
<?merge .searchFields ?>
...
...
@@ -189,7 +175,7 @@ FulltextSearchForm = {
search
:
function
()
{
var
query
=
this
.
serialize
();
if
(
query
.
text
==
''
&&
query
.
description
==
""
&&
query
.
originatingStartDate
==
""
&&
query
.
originatingEndDate
==
""
&&
query
.
profileReference
==
""
&&
query
.
hasParent
==
"
0
"
)
{
if
(
query
.
text
==
''
&&
query
.
description
==
""
&&
query
.
originatingStartDate
==
""
&&
query
.
originatingEndDate
==
""
&&
query
.
profileReference
==
""
)
{
if
(
query
.
filePlanPosition
)
{
trigger
(
'
loadFolder.filePlan
'
,
[
query
.
filePlanPosition
]);
...
...
@@ -276,11 +262,6 @@ FulltextSearchForm = {
originatingEndDate
:
advancedSearchPanel
.
find
(
'
[name="originatingDateMax"]
'
).
data
(
'
datepicker
'
).
getFormattedDate
(
'
yyyy-mm-dd
'
)
};
$hasParent
=
$
(
"
#objectType > .active > input
"
).
val
();
if
(
$hasParent
!=
""
)
{
query
.
hasParent
=
$hasParent
;
}
var
text
=
this
.
form
.
find
(
'
[name="searchForm_inputSearch"]
'
).
val
().
trim
();
if
(
text
)
{
query
.
text
=
text
...
...
@@ -431,10 +412,4 @@ FulltextSearchForm = {
$
(
'
#fullTextSearchForm
'
).
onEvent
(
"
setSearchBarClass.recordsManagement
"
,
function
(
e
,
newClass
)
{
$
(
'
#fullTextSearchForm
'
).
addClass
(
newClass
);
});
$
(
'
#objectType
'
).
on
(
'
click
'
,
'
label.btn
'
,
function
()
{
var
select
=
$
(
this
);
select
.
closest
(
'
.btn-group
'
).
find
(
'
.btn-info
'
).
removeClass
(
'
btn-info
'
).
removeClass
(
'
active
'
).
addClass
(
'
btn-default
'
);
select
.
removeClass
(
'
btn-default
'
).
addClass
(
'
btn-info
'
).
addClass
(
'
active
'
);
});
</script>
src/presentation/maarchRM/Resources/view/recordsManagement/archive/searchform.html
View file @
b5e87b87
...
...
@@ -207,13 +207,13 @@
<!-- OBJECT TYPE -->
<div
class=
"col-md-4"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-4 control-label"
>
Type
d'objet
<span
style=
"color : red"
>
*
</span></label>
<label
class=
"col-sm-4 control-label"
>
Type
<span
style=
"color : red"
>
*
</span></label>
<div
class=
"btn-group col-sm-8"
data-toggle=
"buttons"
>
<label
class=
"btn btn-info active col-sm-[?merge isPublicArchive.bool().then(4, 6) ?]"
title=
"Archive"
>
<input
type=
"checkbox"
class=
"hasParent"
name=
"hasParent"
value=
"0"
checked
/>
Archive
</label>
<label
class=
"btn [?merge isPublicArchive.bool().then('btn-default', 'btn-info active') ?] col-sm-[?merge isPublicArchive.bool().then(4, 6) ?]"
title=
"
Objet d'
archive"
>
<input
type=
"checkbox"
class=
"hasParent"
name=
"hasParent"
value=
"1"
/>
Objet
<label
class=
"btn [?merge isPublicArchive.bool().then('btn-default', 'btn-info active') ?] col-sm-[?merge isPublicArchive.bool().then(4, 6) ?]"
title=
"
Sub-
archive"
>
<input
type=
"checkbox"
class=
"hasParent"
name=
"hasParent"
value=
"1"
/>
Sub-archive
</label>
<?merge isPublicArchive.bool() ?>
<label
class=
"btn btn-default col-sm-4"
title=
"Document"
>
...
...
Write
Preview
Supports
Markdown
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