-
-
- Download CV as JSON
+
+
diff --git a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
index bf87def14..e07d35b32 100644
--- a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
+++ b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss
@@ -1,90 +1,85 @@
-
.form-row {
- width:100%;
- display: flex;
- justify-content: space-between;
- align-items: flex-end;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
}
.double-row {
- justify-content: space-evenly;
-
+ justify-content: space-evenly;
}
-
.validation {
-display:flex;
-flex-direction: column;
-width: 100%;
-margin-bottom:5px;
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ margin-bottom: 5px;
}
-
.ERROR {
- background-color: var(--regular-red-color);
- color: var(--error-dialog-color);
- background-color: var(--error-dialog-bg-color);
- padding: 4px 5px;
- margin-right: 5px;
- border-radius: 5px;
+ background-color: var(--regular-red-color);
+ color: var(--error-dialog-color);
+ background-color: var(--error-dialog-bg-color);
+ padding: 4px 5px;
+ margin-right: 5px;
+ border-radius: 5px;
}
-
.WARNING {
- color: var(--warning-dialog-color);
- background-color: var(--warning-dialog-bg-color);
- padding: 4px 5px;
- margin-right: 5px;
- border-radius: 5px;
+ color: var(--warning-dialog-color);
+ background-color: var(--warning-dialog-bg-color);
+ padding: 4px 5px;
+ margin-right: 5px;
+ border-radius: 5px;
}
.INFO {
- color: var(--regular-black-color);
- background-color: var(--regular-lightgray-color);
- padding: 4px 5px;
- margin-right: 5px;
- border-radius: 5px;
+ color: var(--regular-black-color);
+ background-color: var(--regular-lightgray-color);
+ padding: 4px 5px;
+ margin-right: 5px;
+ border-radius: 5px;
}
.message {
- padding-top: 5px;
- padding-left: 15px;
-
+ padding-top: 5px;
+ padding-left: 15px;
}
.content-fix {
- min-height: 250px;
- padding: 15px 20px;
-
+ min-height: 250px;
+ padding: 15px 20px;
}
.src-column {
- display: flex;
- flex-direction:column;
- width:50%;
-
+ display: flex;
+ flex-direction: column;
+ width: 50%;
}
.actions {
- height: 75px;
+ height: 75px;
}
.title {
- height: 42px;
+ height: 42px;
+ font-size: 32px;
+ font-weight: 500;
+ letter-spacing: normal;
+ margin-bottom: 20px;
}
.loading-container {
- max-height: calc(100% - 150px);
- min-height: 250px;
- width: 100%;
- align-content: center;
+ max-height: calc(100% - 150px);
+ min-height: 250px;
+ width: 100%;
+ align-content: center;
}
-::ng-deep .mat-dialog-container {
- height: unset !important;
- max-height: 90%;
+::ng-deep .mat-mdc-dialog-container .mdc-dialog__surface {
+ height: unset !important;
+ max-height: 90vh;
}
.delete-icon {
- margin-bottom: 20px;
-
+ margin-bottom: 20px;
}
diff --git a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.ts b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.ts
index 172b08b07..22521d7d0 100644
--- a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.ts
+++ b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.ts
@@ -6,9 +6,10 @@ import { OverlayContainer } from '@angular/cdk/overlay';
import { FragmentWizardComponent } from '@gsrs-core/admin/fragment-wizard/fragment-wizard.component';
@Component({
- selector: 'app-cv-term-dialog',
- templateUrl: './cv-term-dialog.component.html',
- styleUrls: ['./cv-term-dialog.component.scss']
+ selector: 'app-cv-term-dialog',
+ templateUrl: './cv-term-dialog.component.html',
+ styleUrls: ['./cv-term-dialog.component.scss'],
+ standalone: false
})
export class CvTermDialogComponent implements OnInit, AfterViewInit{
isNew: boolean;
@@ -71,20 +72,12 @@ export class CvTermDialogComponent implements OnInit, AfterViewInit{
}
editTerms(term: any, index): void {
- // this.dialog.openDialogs.pop();
- // this.overlayContainer.style.zIndex = '1003';
let thisy = window.pageYOffset;
- /* window.scroll({
- top: 0,
- left: 0,
- behavior: 'auto' });*/
let dialogConfig = { width: '70%', height: '85%',data: {vocabulary: this.vocabulary, domain: this.vocabulary.domain, term: term, adminPanel: true}, };
const dialogRef = this.dialog.open(FragmentWizardComponent, dialogConfig);
this.overlayContainer.style.zIndex = '1003';
setTimeout(() => {
- // this.dialog.openDialogs.pop();
- // this.overlayContainer.style.zIndex = '10003';
},3000);
const dialogSubscription = dialogRef.afterClosed().subscribe(response => {
window.scroll({
@@ -126,7 +119,8 @@ export class CvTermDialogComponent implements OnInit, AfterViewInit{
}, 200);
}
},error => {
- let str = 'Invalid Vocabulary';
+ let str = 'Error Updating Vocabulary';
+ console.log(`error.error: ${error.error}; error.message: ${error.message}`);
if (error.error && error.error.message) {
str += '\n\n' + error.error.message;
@@ -158,19 +152,6 @@ export class CvTermDialogComponent implements OnInit, AfterViewInit{
this.loading = false;
});
- /* this.cvService.addVocabTerm( this.vocabulary).subscribe (response => {
- this.loading = false;
- if (response.terms && response.terms.length === this.vocabulary.terms.length) {
- alert('vocabulary updated');
- setTimeout(() => {
- this.dialogRef.close(response);
- }, 200);
- } else {
- alert('invalid vocabulary');
- }
- }, error => {
- alert('invalid vocabulary');
- });*/
this.loading = false;
}
diff --git a/src/app/core/admin/data-management/data-management.component.html b/src/app/core/admin/data-management/data-management.component.html
index bf77ee0de..73218ef60 100644
--- a/src/app/core/admin/data-management/data-management.component.html
+++ b/src/app/core/admin/data-management/data-management.component.html
@@ -1,52 +1,76 @@
-
+
-
+
+ Download CV as JSON
-
+
-
-
-
| Domain | -{{vocab.domain}} | -
|---|
| + Domain + | +{{ vocab.domain }} | +Substance Fields | -- - - - {{toggle[index] || i < 2? field+' ':''}} - {{(toggle[index] || i < 1) && !last? ', ':''}} - {{!toggle[index] && i === 1 && !last? '...':''}} - - - - - | -+ Substance Fields + | ++ + + + {{ toggle[index] || i < 2 ? field + " " : "" }} + {{ (toggle[index] || i < 1) && !last ? ", " : "" }} + {{ !toggle[index] && i === 1 && !last ? "..." : "" }} + + + + + | +Vocabulary Term Type | -{{getVocabType(vocab.vocabularyTermType)}} | -Count | -{{vocab.terms.length}} | -Edit | -
-
-
-
- |
-
|---|
+
+
+
-
+
diff --git a/src/app/core/admin/cv-management/cv-management.component.scss b/src/app/core/admin/cv-management/cv-management.component.scss
index 525280e5e..3cf0f60fc 100644
--- a/src/app/core/admin/cv-management/cv-management.component.scss
+++ b/src/app/core/admin/cv-management/cv-management.component.scss
@@ -1,63 +1,69 @@
.vocab-row {
- width:100%;
- display: flex;
- flex-direction: row;
- align-content: space-around;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ align-content: space-around;
- .domain, .count, .editable, .edit {
- width:20%;
- }
+ .domain,
+ .count,
+ .editable,
+ .edit {
+ width: 20%;
+ }
- padding:10px;
+ padding: 10px;
}
-
.search {
- width: 400px;
- max-width: 100%;
- margin-right:20px;
+ width: 400px;
+ max-width: 100%;
+ margin-right: 20px;
}
-.icon-align{
+.icon-align {
margin-top: -10px;
vertical-align: bottom;
}
.management-container {
- min-width: 900px;
- max-width:1500px;
+ min-width: 900px;
+ max-width: 1500px;
}
.button-fix {
- height:46px;
- line-height: 46px;
+ height: 46px;
+ line-height: 46px;
}
::ng-deep .cdk-overlay-pane {
- max-height: 90%;
+ max-height: 90%;
}
-::ng-deep .mat-dialog-container {
- height: unset !important;
- max-height: 90%;
+::ng-deep .mat-mdc-dialog-container {
+ height: unset !important;
+ max-height: 90%;
}
-.mat-dialog-content { max-height: 95%; }
-
+.mat-mdc-dialog-content {
+ max-height: 95%;
+}
.loading-container {
- height: 90%;
- width: 100%;
- align-content: center;
- padding:50px;
+ height: 90%;
+ width: 100%;
+ align-content: center;
+ padding: 50px;
}
.spinner {
- margin: auto;
+ margin: auto;
}
.show-button {
- padding-left: 10px;
- color: var(--link-color);
- font-size:14px;
+ padding-left: 10px;
+ color: var(--link-color);
+ font-size: 14px;
+}
+.mat-button {
+ color: var(--link-color);
}
diff --git a/src/app/core/admin/cv-management/cv-management.component.ts b/src/app/core/admin/cv-management/cv-management.component.ts
index add92b5b0..ef323eeaf 100644
--- a/src/app/core/admin/cv-management/cv-management.component.ts
+++ b/src/app/core/admin/cv-management/cv-management.component.ts
@@ -10,9 +10,10 @@ import { FormControl } from '@angular/forms';
import { DataDictionaryService } from '@gsrs-core/utils/data-dictionary.service';
@Component({
- selector: 'app-cv-management',
- templateUrl: './cv-management.component.html',
- styleUrls: ['./cv-management.component.scss']
+ selector: 'app-cv-management',
+ templateUrl: './cv-management.component.html',
+ styleUrls: ['./cv-management.component.scss'],
+ standalone: false
})
export class CvManagementComponent implements OnInit {
vocabularies: Array< Vocabulary > = [];
diff --git a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.html b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.html
index e0ee03b1c..8e4681640 100644
--- a/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.html
+++ b/src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.html
@@ -1,109 +1,150 @@
-
+
-
+
-
-- Add Term to CV - {{vocabulary.domain}} -
-
-
+
+
-
-
-
-
+
-
-
- -
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Display
+
+
+
+ Value
+
+
-
-
-
+
+ Description
+
+
-
-
-
-
+
-
- Hidden
-
-
-
-
- Selected
-
-
-
-
+
+ Origin
+
+
+
-
+
+ Hidden
+
+
+
+
+ Selected
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
+
+ Format Regex
+
+
+
+ System Category
+
+
+
+
+
+
+
-
-
+
+ Simplified Structure
+
+
-
-
-
-
-
-
-
-
+ CV not valid:
-
-
-
+ ![]()
+
+
+
+
+
+ Fragment Structure
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+CV not valid:
+
+
-