Skip to content
Snippets Groups Projects
Unverified Commit 37eefebb authored by Benaissa BENARBIA's avatar Benaissa BENARBIA Committed by GitHub
Browse files

handle child without parents archive units (#298) 


remove unused variable

update stye and depth

update style

fix bug for show AU without parent and fix design bugs

fix buttons bug "

Co-authored-by: default avatarbbenarbia <benaissa.benarbia@gmail.com>
parent a5a5dcc1
No related branches found
No related tags found
10 merge requests!51Merge mis a jour vitam-ui,!25Nouveau mis a jour Vitamui,!24Nouveau mis a jour Vitamui,!23Nouveau mis a jour Vitamui,!22WIP: nouveau mis a jour Vitamui,!21nouveau mis a jour Vitamui,!20nouveau mis à jour Vitamui,!19nouveau mis à jour Vitamui,!18New MAJ Vitamui,!16[VAS] BUG 7332 : Correction sur la position de la barre permettant de...
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2466 additions and 2186 deletions
api/api-archive-search/archive-search-commons/src/main/java/fr/gouv/vitamui/archives/search/common/dsl/VitamQueryHelper.java
+ 5
− 4
View file @ 37eefebb
...@@ -67,8 +67,8 @@ public class VitamQueryHelper { ...@@ -67,8 +67,8 @@ public class VitamQueryHelper {
} }
private static final int DEFAULT_DEPTH = 30; private static final int DEFAULT_DEPTH = 10;
private static final int FACET_SIZE_MILTIPLIER = 10; private static final int FACET_SIZE_MILTIPLIER = 100;
/* Query fields */ /* Query fields */
private static final String IDENTIFIER = "Identifier"; private static final String IDENTIFIER = "Identifier";
...@@ -111,11 +111,12 @@ public class VitamQueryHelper { ...@@ -111,11 +111,12 @@ public class VitamQueryHelper {
//Handle roots //Handle roots
if (nodes != null && !nodes.isEmpty()) { if (nodes != null && !nodes.isEmpty()) {
select.addRoots(nodes.toArray(new String[nodes.size()])); select.addRoots(nodes.toArray(new String[nodes.size()]));
select.addFacets(
FacetHelper.terms("COUNT_BY_NODE", UNITS_UPS, nodes.size() * FACET_SIZE_MILTIPLIER, FacetOrder.ASC));
query.setDepthLimit(DEFAULT_DEPTH); query.setDepthLimit(DEFAULT_DEPTH);
} }
select.addFacets(
FacetHelper.terms("COUNT_BY_NODE", UNITS_UPS, (nodes.size() + 1) * FACET_SIZE_MILTIPLIER, FacetOrder.ASC));
if (unitTypes == null || unitTypes.isEmpty()) { if (unitTypes == null || unitTypes.isEmpty()) {
LOGGER.error("Error on validation of criteria , units types is mandatory "); LOGGER.error("Error on validation of criteria , units types is mandatory ");
throw new InvalidParseOperationException("Error on validation of criteria, units types is mandatory "); throw new InvalidParseOperationException("Error on validation of criteria, units types is mandatory ");
......
ui/ui-frontend-common/package-lock.json
+ 1006
− 1006
View file @ 37eefebb
This diff is collapsed.
ui/ui-frontend/package-lock.json
+ 406
− 406
View file @ 37eefebb
This diff is collapsed.
ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.scss
+ 281
− 211
View file @ 37eefebb
.input-criteria{ .input-criteria {
border: 1px solid var(--vitamui-secondary) border: 1px solid var(--vitamui-secondary);
} }
.archive-search-section{ .archive-search-section {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
margin-bottom: 15px; margin-bottom: 15px;
padding-bottom: 10px; padding-bottom: 10px;
} }
.search-input-criteria{ .search-input-criteria {
width: 100%; width: 100%;
} }
.search-select-access-contract{ .search-select-access-contract {
width: 100%; width: 100%;
background-color: #ffffff; background-color: #ffffff;
font-size: 14px; font-size: 14px;
font-weight: 700; font-weight: 700;
color: var(--vitamui-primary); color: var(--vitamui-primary);
letter-spacing: 0.1px; letter-spacing: 0.1px;
line-height: 10px; line-height: 10px;
white-space: nowrap; white-space: nowrap;
transform-origin: left; transform-origin: left;
transition: transform 150ms ease-out; transition: transform 150ms ease-out;
} }
.search-date-filter{ .search-date-filter {
height: 50px; height: 50px;
border: solid 1px var(--vitamui-secondary); border: solid 1px var(--vitamui-secondary);
border-radius: 25px; border-radius: 25px;
text-align: center; text-align: center;
color: var(--vitamui-secondary); color: var(--vitamui-secondary);
border-radius: 25px; border-radius: 25px;
border: solid 1px #f0f0f0; border: solid 1px #f0f0f0;
background-color: #ffffff; background-color: #ffffff;
padding: 7px 45px 7px 25px; padding: 7px 45px 7px 25px;
transition: border-color 150ms ease-out; transition: border-color 150ms ease-out;
vertical-align: top; vertical-align: top;
cursor: pointer; cursor: pointer;
outline: none; outline: none;
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 2px 2px rgba(0, 0, 0, 0.12), 0px 0px 2px rgba(0, 0, 0, 0.14); box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 2px 2px rgba(0, 0, 0, 0.12), 0px 0px 2px rgba(0, 0, 0, 0.14);
} }
.mat-select-content{ .mat-select-content {
font-size: 14px; font-size: 14px;
font-weight: 700; font-weight: 700;
color: var(--vitamui-primary); color: var(--vitamui-primary);
letter-spacing: 0.1px; letter-spacing: 0.1px;
line-height: 10px; line-height: 10px;
white-space: nowrap; white-space: nowrap;
transform-origin: left; transform-origin: left;
transition: transform 150ms ease-out; transition: transform 150ms ease-out;
} }
.search-date-label { .search-date-label {
position: absolute; position: absolute;
font-size: 14px; font-size: 14px;
font-weight: 700; font-weight: 700;
color: var(--vitamui-primary); color: var(--vitamui-primary);
letter-spacing: 0.1px; letter-spacing: 0.1px;
line-height: 10px; line-height: 10px;
white-space: nowrap; white-space: nowrap;
transform-origin: left; transform-origin: left;
transition: transform 150ms ease-out; transition: transform 150ms ease-out;
} }
.card-criteria { .card-criteria {
background: #FFFFFF; background: #ffffff;
border: 1px solid #BDBDBD; border: 1px solid #bdbdbd;
box-sizing: border-box; box-sizing: border-box;
border-radius: 5px; border-radius: 5px;
margin-bottom: 50px; margin-bottom: 50px;
padding-top: 20px; padding-top: 20px;
margin-top: 20px; margin-top: 20px;
margin-right: 20px; margin-right: 20px;
} }
.before-search-launched-button{ .after-search-launched-button {
border: 1px solid #9D9D9D; color: #fff;
box-sizing: border-box; background-color: #2c76c9;
border-radius: 5px; border: 1px solid #9d9d9d;
box-sizing: border-box;
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
}
.before-search-launched-button {
border: 1px solid #9d9d9d;
box-sizing: border-box;
border: 1px solid #9d9d9d;
border-left: 0px;
} }
.criteria-group { .criteria-group {
padding: 10px padding: 10px;
} }
.left-arround { .left-arround {
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border: 1px solid #9D9D9D; border: 1px solid #9d9d9d;
} }
.left-not-arround { .left-not-arround {
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
border: 1px solid #9D9D9D; border: 1px solid #9d9d9d;
} }
.right-arround { .right-arround {
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border: 1px solid #9D9D9D; border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
border: 1px solid #9d9d9d;
border-left: 0px;
} }
.right-not-arround { .right-button {
border-top-right-radius: 0px; border-top-right-radius: 0px;
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
border: 1px solid #9D9D9D; border: 1px solid #9d9d9d;
border-left: 0px;
} }
.button-or { .button-or {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-right-width: 0px; border-right-width: 0px;
border-left-width: 0px; border-left-width: 0px;
height: 60px; height: 60px;
font-weight: bold; font-weight: bold;
padding-top: 18px;
} }
.button-content { .button-content {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-right-width: 0px; padding-top: 18px;
max-width: 400px; border-right-width: 0px;
font-weight: bold; max-width: 400px;
height: 60px; font-weight: bold;
border: 1px solid #9D9D9D; height: 60px;
border: 1px solid #9d9d9d;
} }
.vitamui-chip-list .button-criteria {
background: #ffffff !important;
border: px solid #bdbdbd !important;
}
.button-remove { .button-remove {
padding-left: 4px; padding-left: 4px;
padding-right: 0px; padding-right: 0px;
border-left-width: 1px; border-left-width: 1px;
height: 60px; height: 60px;
font-weight: bold; font-weight: bold;
border: 1px solid #9D9D9D; border: 1px solid #9d9d9d;
} }
.hide-ink { .hide-ink {
cursor: pointer; cursor: pointer;
color: #702382;; color: #702382;
text-decoration: underline; text-decoration: underline;
font-weight: bold; font-weight: bold;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
padding-left: 30px; padding-left: 30px;
} }
.launch-search-btn{ .launch-search-btn {
width: 218px; width: 218px;
height: 50px; height: 50px;
background: #702382; background: #702382;
border-radius: 100px; border-radius: 100px;
color: white; color: white;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
letter-spacing: 0.1px; letter-spacing: 0.1px;
text-decoration-line: underline; text-decoration-line: underline;
} }
.button-remove { .button-remove {
border-left-width: 0px; border-left-width: 0px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
max-width: 400px; max-width: 400px;
font-weight: bold; font-weight: bold;
height: 60px; height: 60px;
} }
.hide-area-search { .hide-area-search {
margin-bottom: 10px; margin-bottom: 10px;
} }
.area-criteria { .area-criteria {
padding-top: 20px; padding-top: 20px;
display: -webkit-flex;
display: flex;
-webkit-flex-direction: row;
flex-direction: row;
justify-content: flex-start;
flex-wrap: wrap;
} }
.area-download{ .area-download {
text-align: right; text-align: right;
right: 5px; right: 5px;
} }
.icon-download { .icon-download {
color: var(--vitamui-primary); color: var(--vitamui-primary);
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
font-size: 22px; font-size: 22px;
} }
.search-criterias {
.search-criterias{ font-size: large;
font-size: large; font-weight: bold;
font-weight: bold; margin-top: 50px;
margin-top: 50px;
} }
.left-margin {
.left-margin{ margin-left: 30%;
margin-left: 30%;
} }
.show-panel { .show-panel {
display: none; display: none;
} }
.hide-panel { .hide-panel {
display: block; display: block;
} }
::ng-deep .my-menu { ::ng-deep .my-menu {
max-width: 380px; max-width: 380px;
} }
.circle { .circle {
display: flex;
display: flex; flex-direction: row;
flex-direction: row; justify-content: center;
justify-content: center; align-items: center;
align-items: center; padding: 13px;
padding: 13px; position: static;
position: static; width: 50px;
width: 50px; height: 50px;
height: 50px; left: 0px;
left: 0px; top: 0px;
top: 0px;
background: var(--vitamui-secondary);
background: var(--vitamui-secondary); border-radius: 50px;
border-radius: 50px;
flex: none;
flex: none; order: 0;
order: 0; flex-grow: 0;
flex-grow: 0; border: none;
border: none; }
}
.circle:focus {
.circle:focus{ border: none;
border:none; outline: -webkit-focus-ring-color auto 0px;
outline: -webkit-focus-ring-color auto 0px; outline-color: -webkit-focus-ring-color;
outline-color: -webkit-focus-ring-color; outline-style: auto;
outline-style: auto; outline-width: 0px;
outline-width: 0px;
} }
.primary-save-icon { .primary-save-icon {
color: white; color: white;
} }
.mat-boutton { .mat-boutton {
border: none; border: none;
background: #f5f7fc; background: #f5f7fc;
} }
.mat-boutton:hover .mat-boutton:focus{ .mat-boutton:hover .mat-boutton:focus {
background: #f5f7fc; background: #f5f7fc;
border:none; border: none;
} }
.mat-boutton:focus{ .mat-boutton:focus {
background: #f5f7fc; background: #f5f7fc;
border:none; border: none;
outline: -webkit-focus-ring-color auto 0px; outline: -webkit-focus-ring-color auto 0px;
outline-color: -webkit-focus-ring-color; outline-color: -webkit-focus-ring-color;
outline-style: auto; outline-style: auto;
outline-width: 0px; outline-width: 0px;
} }
.mat-boutton:active{ .mat-boutton:active {
background: #f5f7fc; background: #f5f7fc;
border:none; border: none;
} }
.div-btn-delete { .div-btn-delete {
width:78px; width: 78px;
} }
.btn-add { .btn-add {
color: #757575; color: #757575;
font-size: 37x; font-size: 37x;
} }
.btn-new-save { .btn-new-save {
font-size: 16px; font-size: 16px;
} }
.button-space { .button-space {
margin-left: -20px; margin-left: -20px;
padding-left: 30px; padding-left: 30px;
} }
\ No newline at end of file
.vitamui-search-criteria-list {
display: flex;
flex-wrap: wrap;
align-items: flex-start;
height: 60px;
.vitamui-search-criteria {
display: flex;
align-items: stretch;
font-size: 13px;
cursor: pointer;
min-width: 100px;
&:not(:last-child) {
margin-right: 10px;
margin-bottom: 10px;
}
.vitamui-search-criteria-content {
padding: 6px 10px;
flex-grow: 1;
}
.vitamui-remove-search-criteria {
display: flex;
align-items: center;
border-top: 1px solid #9d9d9d;
border-right: Opx solid #9d9d9d;
border-bottom: 1px solid #9d9d9d;
//border-radius: 0px 5px 5px 0px;
padding: 6px;
i {
font-size: 14px;
}
}
.vitamui-or-search-criteria {
display: flex;
align-items: center;
border-top: 1px solid #9d9d9d;
border-right: 1px solid #9d9d9d;
border-bottom: 1px solid #9d9d9d;
//border-radius: 0px 0px 0px 0px;
padding: 6px;
i {
font-size: 14px;
}
}
}
}
.vitamui-search-criteria {
background-color: white;
border: 1px solid #f0f0f0;
border-radius: 5px;
color: var(--vitamui-grey-900);
font-size: 12px;
font-weight: bold;
}
ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.html
+ 4
− 0
View file @ 37eefebb
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
<li class="mat-tree-node filing-holding-scheme-tree-node"> <li class="mat-tree-node filing-holding-scheme-tree-node">
<app-filing-holding-node disabled [node]="node" (nodeToggle)="nestedTreeControlFull.toggle(node)" <app-filing-holding-node disabled [node]="node" (nodeToggle)="nestedTreeControlFull.toggle(node)"
(labelClick)="emitNode(node)"></app-filing-holding-node> (labelClick)="emitNode(node)"></app-filing-holding-node>
<span *ngIf="node?.count != null && hasResults && node?.count > 0 " class="badge badge-secondary pad">{{node?.count | number : '1.0'}}</span> <span *ngIf="node?.count != null && hasResults && node?.count > 0 " class="badge badge-secondary pad">{{node?.count | number : '1.0'}}</span>
</li> </li>
</ng-container> </ng-container>
</mat-tree-node> </mat-tree-node>
...@@ -28,7 +30,9 @@ ...@@ -28,7 +30,9 @@
<app-filing-holding-node [node]="node" [expanded]="nestedTreeControlFull.isExpanded(node)" <app-filing-holding-node [node]="node" [expanded]="nestedTreeControlFull.isExpanded(node)"
(nodeToggle)="nestedTreeControlFull.toggle(node)" (nodeToggle)="nestedTreeControlFull.toggle(node)"
(labelClick)="emitNode(node)"></app-filing-holding-node> (labelClick)="emitNode(node)"></app-filing-holding-node>
<span *ngIf="node?.count != null && hasResults && node?.count > 0" class="badge badge-secondary pad">{{node?.count | number : '1.0'}}</span> <span *ngIf="node?.count != null && hasResults && node?.count > 0" class="badge badge-secondary pad">{{node?.count | number : '1.0'}}</span>
</div> </div>
<ul [class.filing-holding-scheme-tree-invisible]="!nestedTreeControlFull.isExpanded(node)"> <ul [class.filing-holding-scheme-tree-invisible]="!nestedTreeControlFull.isExpanded(node)">
<ng-container matTreeNodeOutlet></ng-container> <ng-container matTreeNodeOutlet></ng-container>
......
ui/ui-frontend/projects/archive-search/src/app/archive/filing-holding-scheme/filing-holding-scheme.component.scss
+ 55
− 47
View file @ 37eefebb
@import '~ui-frontend-common/sass/variables/colors'; @import '~ui-frontend-common/sass/variables/colors';
.tree-filing-scheme-side-panel{ .tree-filing-scheme-side-panel {
min-width: 100%; min-width: 100%;
height: 100vh; height: 100vh;
background: white; background: white;
margin-top: 90px; margin-top: 90px;
} }
.tree-filing-scheme{ .tree-filing-scheme {
height:auto; height: auto;
max-height: 70vh; max-height: 70vh;
overflow:auto; overflow: auto;
width: 100%; width: 100%;
overflow-x: auto; overflow-x: auto;
white-space: nowrap; white-space: nowrap;
background-color: #fafafa; background-color: #fafafa;
} }
.filing-holding-scheme-tree-invisible { .filing-holding-scheme-tree-invisible {
display: none; display: none;
} }
.filing-holding-scheme-tree ul, .filing-holding-scheme-tree ul,
...@@ -26,54 +26,62 @@ ...@@ -26,54 +26,62 @@
} }
.filing-holding-scheme-tree-node { .filing-holding-scheme-tree-node {
border-bottom: 1px solid transparentize(#979797, 0.7); position: relative;
color: var(--vitamui-secondary-dark-5); border-bottom: 1px solid transparentize(#979797, 0.7);
cursor: pointer; color: var(--vitamui-secondary-dark-5);
cursor: pointer;
&:hover { &:hover {
// text-decoration: underline; // text-decoration: underline;
background-color: rgba(250, 250, 250, 1); background-color: rgba(250, 250, 250, 1);
} }
} }
.loader { .loader {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background: rgba(255, 255, 255, 0.8); background: rgba(255, 255, 255, 0.8);
} }
.icon-greeny-blue { .icon-greeny-blue {
color: var(--vitamui-secondary); color: var(--vitamui-secondary);
} }
.tree-show-link { .tree-show-link {
cursor: pointer; cursor: pointer;
color: #979797;; color: #979797;
text-decoration: underline; text-decoration: underline;
} }
.badge { .badge {
display: inline-block; display: inline-block;
padding: .25em 1.5em; padding: 0.25em 1.5em;
font-size: 100%; font-size: 100%;
font-weight: 700; font-weight: 700;
line-height: 1; line-height: 1;
position: absolute; position: absolute;
white-space: nowrap; top: 14px;
vertical-align: baseline; white-space: nowrap;
border-radius: 1.25rem; vertical-align: baseline;
right: 35px; border-radius: 1.25rem;
right: 2px;
width: 54px;
text-align: right;
} }
.badge-secondary { .badge-secondary {
color: #2C76C9; color: #2c76c9;
background-color: #ABCAED; background-color: #abcaed;
} }
.area-show-tree { .area-show-tree {
padding-top: 20px; padding-top: 20px;
}
.badge-parent {
position: relative;
} }
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