diff --git a/ui/ui-archive-search/src/main/config/ui-archive-search-application-dev.yml b/ui/ui-archive-search/src/main/config/ui-archive-search-application-dev.yml index 722b870c11b33cea5e5a44309a3113e3468efe5a..a9c748dc0099c25381a1dc530923fc93504fd7f5 100644 --- a/ui/ui-archive-search/src/main/config/ui-archive-search-application-dev.yml +++ b/ui/ui-archive-search/src/main/config/ui-archive-search-application-dev.yml @@ -72,7 +72,7 @@ ui-archive-search: portal: "https://dev.vitamui.com:4200" archives-search: "https://dev.vitamui.com:4209/archive-search" ingest: "https://dev.vitamui.com:4208/ingest" - referential: "https://dev.vitamui.com:4202/referential" + referential: "https://dev.vitamui.com:4202" portal-categories: ingest_and_consultation: diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts index c189e69eebb446476aab50647d4d22ab23fbb378..0ebe50d7f87175e24040d05c95c126e57569e609 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/archive-search.component.ts @@ -950,6 +950,9 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy { if (action) { this.listOfUACriteriaSearch = []; this.itemSelected++; + if (this.itemSelected === this.totalResults) { + this.isIndeterminate = false; + } this.listOfUAIdToInclude.push({ value: id, id }); this.listOfUAIdToExclude.splice(0, this.listOfUAIdToExclude.length); } else { @@ -1094,13 +1097,7 @@ export class ArchiveSearchComponent implements OnInit, OnChanges, OnDestroy { if (this.eliminationAnalysisResponse && this.eliminationAnalysisResponse[0].itemId) { const guid = this.eliminationAnalysisResponse[0].itemId; const message = this.translateService.instant('ARCHIVE_SEARCH.ELIMINATION.ELIMINATION_LAUNCHED'); - const index = this.startupService.getReferentialUrl().lastIndexOf('/'); - const serviceUrl = - this.startupService.getReferentialUrl().substring(0, index) + - '/logbook-operation/tenant/' + - this.tenantIdentifier + - '?guid=' + - guid; + const serviceUrl = this.startupService.getReferentialUrl() + '/logbook-operation/tenant/' + this.tenantIdentifier + '?guid=' + guid; this.openSnackBarForWorkflow(message, serviceUrl); } diff --git a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/dip-request-create/dip-request-create.component.ts b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/dip-request-create/dip-request-create.component.ts index c791cecc80eec86bf655b7fcce5159bd528f2040..26923554e91293582a9a0244f2377a382f2d43bf 100644 --- a/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/dip-request-create/dip-request-create.component.ts +++ b/ui/ui-frontend/projects/archive-search/src/app/archive/archive-search/dip-request-create/dip-request-create.component.ts @@ -117,13 +117,8 @@ export class DipRequestCreateComponent implements OnInit, OnDestroy { this.archiveService.exportDIPService(exportDIPCriteriaList, this.data.accessContract).subscribe( (response) => { this.dialogRef.close(true); - const index = this.startupService.getReferentialUrl().lastIndexOf('/'); const serviceUrl = - this.startupService.getReferentialUrl().substring(0, index) + - '/logbook-operation/tenant/' + - this.data.tenantIdentifier + - '?guid=' + - response; + this.startupService.getReferentialUrl() + '/logbook-operation/tenant/' + this.data.tenantIdentifier + '?guid=' + response; this.archiveService.openSnackBarForWorkflow(this.translate.instant('ARCHIVE_SEARCH.DIP.REQUEST_MESSAGE'), serviceUrl); }, diff --git a/ui/ui-frontend/projects/referential/src/app/core/api/operation-api.service.ts b/ui/ui-frontend/projects/referential/src/app/core/api/operation-api.service.ts index df6ef894b5dd277208db9a102da10fae57b87080..b2254cb8392c87e1b6b81bc59172522d937b3632 100644 --- a/ui/ui-frontend/projects/referential/src/app/core/api/operation-api.service.ts +++ b/ui/ui-frontend/projects/referential/src/app/core/api/operation-api.service.ts @@ -86,9 +86,6 @@ export class OperationApiService extends BaseHttpClient<Event> { } downloadProbativeValue(id: string, headers?: HttpHeaders): Observable<Blob> { - console.log('Download probative value ', this.apiUrl, id, headers); return this.http.get(`${this.apiUrl}/probativeValue/${id}`, { responseType: 'blob', headers }); } - - // return this.http.get(`${this.apiUrl}/downloadobjectfromunit/${id}`, { headers: headers, observe: 'response', responseType: 'blob' }); } diff --git a/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-list/logbook-management-operation-list.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-list/logbook-management-operation-list.component.html index aa46251e78756edbcae436db1896bd600ebe7137..d4a39163279797e544a076c32ce9f5ddc3fcc4cb 100644 --- a/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-list/logbook-management-operation-list.component.html +++ b/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-list/logbook-management-operation-list.component.html @@ -147,7 +147,7 @@ <div class="col-2"> <div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div> <span class="date"> - {{ operation?.processDate | date: 'hh:mm:ss':'-1000' }} + {{ operation?.processDate | date: 'HH:mm:ss' }} </span> </div> diff --git a/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-preview/logbook-management-operation-information-tab/logbook-management-operation-information-tab.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-preview/logbook-management-operation-information-tab/logbook-management-operation-information-tab.component.html index 7b99f3f8205a7f145fa0b254d37abf086e218eb2..9a62ebb79cc98c1b79d42e8870bb4d9f03d883e5 100644 --- a/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-preview/logbook-management-operation-information-tab/logbook-management-operation-information-tab.component.html +++ b/ui/ui-frontend/projects/referential/src/app/logbook-management-operation/logbook-management-operation-preview/logbook-management-operation-information-tab/logbook-management-operation-information-tab.component.html @@ -18,14 +18,14 @@ <label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.OPERATION_DATE' | translate }}</label> <div>{{ operation?.processDate | date: 'dd/MM/yyyy' }}</div> <span class="date"> - {{ operation?.processDate | date: 'hh:mm:ss':'+0000' }} + {{ operation?.processDate | date: 'HH:mm:ss' }} </span> </div> <div class="col-6 mb-3"> <label> {{ 'LOGBOOK_OPERATION_INFORMATIONS.FINAL_DATE' | translate }}</label> <div>{{ getEventEndDate(event)?.dateTime | date: 'dd/MM/yyyy' }}</div> <span class="date"> - {{ getEventEndDate(event)?.dateTime | date: 'hh:mm:ss' }} + {{ getEventEndDate(event)?.dateTime | date: 'HH:mm:ss':'-2000' }} </span> </div> </div>