-
-
-
-
- ![gsrs-logo]()
-
-
- Ver. {{ version }}
+
+
@@ -396,7 +398,7 @@
+
-
-
+ @if (showTopBanner) {
+
-
-
-
-
-
-
-
-
- Browse Applications
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ navItem.display }}
-
-
- {{ navItem.display }}
-
-
- Import Substance
-
-
-
-
-
-
-
- {{ navItem.display }}
-
-
- {{ navItem.display }}
-
-
-
-
-
-
-
-
-
-
- ;
- isPfdaVersion: boolean = false;
- customToolbarComponent: string = "";
- canRegister = false;
- registerNav: Array;
- searchNav: Array;
- adverseEventShinyHomepageDisplay = false;
- loadedComponents: LoadedComponents;
- private overlayContainer: HTMLElement;
- private bottomSheetOpenTimer: any;
- private bottomSheetRef: MatBottomSheetRef;
- private bottomSheetCloseTimer: any;
- private selectedText: string;
- private subscriptions: Array = [];
- private wildCardText: string;
- private classicLinkQueryParams = {};
- showHeaderBar = "true";
- showRegistrars = true;
- showBrowseOther = true;
+ isPfdaVersion: boolean;
+ showTopBanner: boolean;
+ showFooter: boolean;
+
+ private subscriptions: Subscription[] = [];
constructor(
private router: Router,
- public authService: AuthService,
+ private authService: AuthService,
private configService: ConfigService,
- private activatedRoute: ActivatedRoute,
- private overlayContainerService: OverlayContainer,
private loadingService: LoadingService,
- private bottomSheet: MatBottomSheet,
- private dialog: MatDialog,
- private substanceTextSearchService: SubstanceTextSearchService,
- private utilsService: UtilsService,
- private wildCardService: WildcardService,
- private breakpointObserver: BreakpointObserver,
) {
this.isPfdaVersion = this.configService.configData.isPfdaVersion === true;
- this.customToolbarComponent = this.configService.configData.customToolbarComponent;
- this.wildCardService.wildCardObservable.subscribe((data) => {
- this.wildCardText = data;
- });
+ this.showTopBanner = this.configService.configData.showTopBanner === true;
+ this.showFooter = this.configService.configData.showFooter === true;
}
- @HostListener("document:mouseup", ["$event"])
- @HostListener("document:keyup", ["$event"])
- // @HostListener('document:selectionchange', ['$event'])
- onKeyUp(event: Event) {
- let text = "";
- let selection: Selection;
- let range: Range;
- let selectionStart: number;
- let selectionEnd: number;
- const activeEl: HTMLInputElement = document.activeElement as HTMLInputElement;
-
- if (activeEl != null) {
- const activeElTagName = activeEl ? activeEl.tagName.toLowerCase() : null;
- if (
- activeElTagName === "textarea" ||
- (activeElTagName === "input" &&
- /^(?:text|search|password|tel|url)$/i.test(activeEl.type) &&
- typeof activeEl.selectionStart === "number")
- ) {
- selectionStart = activeEl.selectionStart;
- selectionEnd = activeEl.selectionEnd;
- text = activeEl.value.slice(selectionStart, selectionEnd);
- } else if (window.getSelection) {
- selection = window.getSelection();
- // ###### why just chrome?
- if (selection.rangeCount > 0) {
- range = selection.getRangeAt(0);
- }
- text = selection.toString();
- }
-
- clearTimeout(this.bottomSheetOpenTimer);
-
- if (text && text !== this.selectedText) {
- this.selectedText = text;
- }
- }
- }
-
- async ngOnInit() {
- const breakpointSub = this.breakpointObserver
- .observe(['(min-width: 1611px)', '(min-width: 1501px)'])
- .subscribe(result => {
- this.showRegistrars = result.breakpoints['(min-width: 1611px)'];
- this.showBrowseOther = result.breakpoints['(min-width: 1501px)'];
- });
- this.subscriptions.push(breakpointSub);
- this.showHeaderBar = this.activatedRoute.snapshot.queryParams["header"] || "true";
- this.loadedComponents = this.configService.configData.loadedComponents || null;
-
- this.classicLinkPath = this.configService.environment.clasicBaseHref;
- this.clasicBaseHref = this.configService.environment.clasicBaseHref;
- this.classicLinkQueryParamsString = "";
- this.contactEmail = this.configService.configData.contactEmail || null;
- this.navItems = this.configService.configData.navItems || null;
-
- // CRITICAL: Subscribe to auth FIRST, before any await calls that might fail
- // This ensures UI updates reactively when auth state changes
- const authSubscription = this.authService.getAuth().subscribe((auth) => {
- this.auth = auth;
- // Re-check privileges when auth changes
- if (auth) {
- this.updatePrivileges();
- } else {
- this.canConfigureSystem = false;
- this.canUserImportData = false;
- this.canRegister = false;
- this.canManageCVs = false;
- }
- });
- this.subscriptions.push(authSubscription);
-
- let notempty = false;
- if (this.loadedComponents) {
- if (this.loadedComponents.applications) {
- notempty = true;
- } else if (this.loadedComponents.clinicaltrials) {
- notempty = true;
- } else if (this.loadedComponents.adverseevents) {
- notempty = true;
- } else if (this.loadedComponents.impurities) {
- notempty = true;
- } else if (this.loadedComponents.products) {
- notempty = true;
- } else if (this.loadedComponents.ssg4m) {
- notempty = true;
- }
-
- if (!notempty) {
- this.loadedComponents = null;
- }
- }
-
- // Initial privilege check with error handling
- await this.updatePrivileges();
- //not sure if we need this.
- // TODO: remove it and test that the component works.
- this.baseDomain = this.configService.configData.apiUrlDomain;
+ ngOnInit(): void {
+ this.router.routeReuseStrategy.shouldReuseRoute = () => false;
- this.utilsService
- .getBuildInfo()
- .pipe(take(1))
- .subscribe((buildInfo) => {
- this.version =
- this.configService.configData.version || buildInfo.version;
- this.versionTooltipMessage = `V${this.version}`;
- this.versionTooltipMessage += ` built on ${moment(new Date(buildInfo.buildTime)).utc().format("ddd MMM D YYYY HH:mm:ss z")}`;
- });
- let okToRegister: boolean = await this.authService.canEditData();
-
- this.navItems.forEach((item) => {
- if (item.display === "Register" && okToRegister) {
- this.registerNav = item.children;
- }
- if (item.display === "Search") {
- this.searchNav = item.children;
+ const routerSub = this.router.events.subscribe((event: Event) => {
+ if (event instanceof NavigationStart) {
+ this.loadingService.resetLoading();
}
});
- if (this.loadedComponents) {
- for (let i = this.navItems.length - 1; i >= 0; i--) {
- if (this.navItems[i].children) {
- for (let j = this.navItems[i].children.length - 1; j >= 0; j--) {
- if (this.navItems[i].children[j].component) {
- if (
- !this.loadedComponents[this.navItems[i].children[j].component]
- ) {
- this.navItems[i].children.splice(j, 1);
- }
- }
- }
- }
- if (this.navItems[i].component) {
- if (!this.loadedComponents[this.navItems[i].component]) {
- this.navItems.splice(i, 1);
- }
- }
- }
- }
-
- this.overlayContainer = this.overlayContainerService.getContainerElement();
-
- let urlPath = this.router.routerState.snapshot.url.split("?")[0];
- this.setClassicLinkPath(urlPath.substring(1));
-
- if (this.activatedRoute.snapshot.queryParamMap.has("search")) {
- this.searchValue =
- this.activatedRoute.snapshot.queryParamMap.get("search");
- this.setClassicLinkQueryParams(
- this.activatedRoute.snapshot.queryParamMap,
- );
- }
-
- const paramsSubscription = this.activatedRoute.queryParamMap.subscribe(
- (params) => {
- this.searchValue = params.get("search");
- this.setClassicLinkQueryParams(params);
- },
- );
- this.subscriptions.push(paramsSubscription);
+ this.subscriptions.push(routerSub);
- const authSubscription2 = this.authService.checkAuth().subscribe(
- (_auth) => {},
- (error) => {
+ const authSub = this.authService.checkAuth().subscribe({
+ error: (error) => {
if (
error.status === 403 &&
this.router.url.split("?")[0] !== "/login" &&
@@ -279,363 +51,11 @@ export class BaseComponent implements OnInit, OnDestroy {
this.router.navigate(["/unauthorized"]);
}
},
- );
- this.subscriptions.push(authSubscription2);
-
- this.environment = this.configService.environment;
- this.appId = this.environment.appId;
-
- this.logoSrcPath = `${this.environment.baseHref || ""}assets/images/gsrs-logo.svg`;
-
- const routerSubscription = this.router.events.subscribe((event: Event) => {
- if (event instanceof ResolveEnd) {
- this.mainPathSegment = this.getMainPathSegmentFromUrl(
- event.url.substring(1),
- );
- urlPath = event.url.split("?")[0];
- this.setClassicLinkPath(urlPath.substring(1));
- }
-
- if (event instanceof NavigationStart) {
- this.classicLinkQueryParams = {};
- this.loadingService.resetLoading();
- }
- });
- this.subscriptions.push(routerSubscription);
-
- this.router.routeReuseStrategy.shouldReuseRoute = () => false;
- this.mainPathSegment = this.getMainPathSegmentFromUrl(
- this.router.routerState.snapshot.url.substring(1),
- );
-
- this.substanceTextSearchService.registerSearchComponent(
- "main-substance-search",
- );
- const cleanSearchSubscription = this.substanceTextSearchService
- .setSearchComponentValueEvent("main-substance-search")
- .subscribe((value) => {
- this.searchValue = value;
- });
- this.subscriptions.push(cleanSearchSubscription);
- }
-
- ngOnDestroy() {
- this.subscriptions.forEach((subscription) => {
- subscription.unsubscribe();
- });
- clearTimeout(this.bottomSheetOpenTimer);
- clearTimeout(this.bottomSheetCloseTimer);
- }
-
- getMainPathSegmentFromUrl(url: string): string {
- const path = url.split("?")[0];
- const mainPathPart = path.split("/")[0];
- return mainPathPart;
- }
-
- routeToLogin(): void {
- const navigationExtras: NavigationExtras = {
- queryParams: {
- path: this.router.url,
- },
- };
-
- this.router.navigate(["/login"], navigationExtras);
- }
-
- processSubstanceSearch(searchValue: string) {
- this.wildCardService.getTopSearchBoxText(searchValue);
- this.navigateToSearchResults(searchValue);
- }
-
- navigateToSearchResults(searchTerm: string) {
- const navigationExtras: NavigationExtras = {
- queryParams: searchTerm ? { search: searchTerm } : null,
- };
- this.router.navigate(["/browse-substance"], navigationExtras);
- }
-
- increaseMenuZindex(): void {
- this.overlayContainer.style.zIndex = "1001";
- }
-
- removeZindex(): void {
- this.overlayContainer.style.zIndex = null;
- }
-
- openSearchBottomSheet(searchTerm: string): Observable {
- return new Observable((observer) => {
- if (searchTerm) {
- clearTimeout(this.bottomSheetCloseTimer);
-
- if (this.bottomSheetRef != null) {
- this.bottomSheetRef.dismiss();
- this.bottomSheetRef = null;
- }
-
- this.bottomSheetRef = this.bottomSheet.open(
- HighlightedSearchActionComponent,
- {
- data: { searchTerm: searchTerm },
- hasBackdrop: false,
- closeOnNavigation: true,
- },
- );
-
- const openedSubscription = this.bottomSheetRef
- .afterOpened()
- .subscribe(() => {
- observer.next();
- openedSubscription.unsubscribe();
- });
- this.bottomSheetCloseTimer = setTimeout(() => {
- if (this.bottomSheetRef != null) {
- this.bottomSheetRef.dismiss();
- this.bottomSheetRef = null;
- observer.complete();
- }
- }, 5000);
- const dismissedSubscription = this.bottomSheetRef
- .afterDismissed()
- .subscribe(() => {
- clearTimeout(this.bottomSheetCloseTimer);
- this.bottomSheetRef = null;
- observer.complete();
- dismissedSubscription.unsubscribe();
- });
- } else {
- observer.error();
- observer.complete();
- }
- });
- }
-
- transformMailToPath(item: NavItem) {
- if (item?.kind && item?.mailToPath) {
- let subject = "";
- let email = "";
- if (item.kind === "contact-us") {
- email = this.contactEmail;
- }
- if (item?.queryParams) {
- if (item?.queryParams?.subject) {
- subject = item.queryParams.subject;
- }
- }
- const part1 = sprintf(item.mailToPath, email);
- let part2 = "";
- if (subject) {
- part2 = "subject=" + subject;
- }
- return part1 + "?" + part2;
- }
- return "";
- }
-
- setClassicLinkPath(path: string): void {
- const basePath = this.clasicBaseHref;
-
- const pathDictionary = {
- "/home": "",
- "/browse-substance": "substances",
- "/structure-search": "structure",
- "/sequence-search": "sequence",
- "/substances/register": "wizard",
- "/admin": "admin",
- };
-
- const pathParts = path.split("/");
-
- let pathKey = "";
- pathParts.forEach((part, index) => {
- if (index < 2) {
- pathKey += `/${part}`;
- } else {
- this.setClassicLinkQueryParams(null, { kind: part });
- }
- });
- this.classicLinkPath = `${basePath}${pathDictionary[pathKey] || ""}`;
- }
-
- setClassicLinkQueryParams(
- paramMap?: ParamMap,
- params?: { [queryParam: string]: string },
- ): void {
- if (paramMap != null) {
- const paramsDict = {};
- paramsDict["q"] =
- paramMap.get("search") ||
- paramMap.get("structure_search") ||
- paramMap.get("sequence_search") ||
- paramMap.get("structure");
-
- if (paramMap.get("sequence_search")) {
- paramsDict["type"] = "sequence";
- paramsDict["identity"] = paramMap.get("cutoff");
- paramsDict["identityType"] = paramMap.get("type");
- } else if (
- paramMap.get("structure_search") ||
- paramMap.get("structure")
- ) {
- paramsDict["cutoff"] = paramMap.get("cutoff");
- paramsDict["type"] = paramMap.get("type");
- }
-
- paramsDict["id"] = paramMap.get("sequence");
- paramsDict["seqType"] = paramMap.get("seq_type");
-
- Object.keys(paramsDict).forEach((key) => {
- if (paramsDict[key] != null) {
- this.classicLinkQueryParams[key] = paramsDict[key];
- }
- });
- }
-
- if (params != null) {
- Object.keys(params).forEach((key) => {
- this.classicLinkQueryParams[key] = params[key];
- });
- }
-
- let queryParamsString = "";
- Object.keys(this.classicLinkQueryParams).forEach((key, index) => {
- const separator = (index && "&") || "?";
- queryParamsString += `${separator}${key}=${this.classicLinkQueryParams[key]}`;
- });
-
- this.classicLinkQueryParamsString = queryParamsString;
- }
-
- openProfile(): void {
- const dialogRef = this.dialog.open(UserProfileComponent, {
- data: {},
- width: "800px",
- });
- this.overlayContainer.style.zIndex = "1002";
- const dialogSubscription = dialogRef
- .afterClosed()
- .pipe(take(1))
- .subscribe((response) => {
- this.overlayContainer.style.zIndex = null;
- });
- }
-
- importDialog(): void {
- const dialogRef = this.dialog.open(SubstanceEditImportDialogComponent, {
- width: "650px",
- autoFocus: false,
- });
- this.overlayContainer.style.zIndex = "1002";
-
- const dialogSubscription = dialogRef
- .afterClosed()
- .pipe(take(1))
- .subscribe((response) => {
- if (response) {
- this.overlayContainer.style.zIndex = null;
- this.router.onSameUrlNavigation = "reload";
- this.router.navigateByUrl("/substances/register?action=import", {
- state: { record: response },
- });
- }
- });
- }
-
- viewLists(list?: string): void {
- let data = { view: "all" };
- if (list) {
- data.view = "single";
- data["activeName"] = list.split(":")[1];
- }
- const dialogRef = this.dialog.open(UserQueryListDialogComponent, {
- width: "850px",
- autoFocus: false,
- data: data,
- });
- this.overlayContainer.style.zIndex = "1002";
-
- const dialogSubscription = dialogRef
- .afterClosed()
- .pipe(take(1))
- .subscribe((response) => {
- if (response) {
- this.overlayContainer.style.zIndex = null;
- }
- });
- }
-
- logout() {
- this.authService.logout();
- setTimeout(() => {
- if (
- this.configService.configData &&
- this.configService.configData.logoutRedirectUrl
- ) {
- window.location.href = this.configService.configData.logoutRedirectUrl;
- } else {
- this.router.navigate(["/home"]);
- }
- }, 1200);
- }
-
- viewDrafts(): void {
- const dialogRef = this.dialog.open(SubstanceDraftsComponent, {
- maxHeight: "85%",
- width: "70%",
- data: { view: "user" },
- });
- this.overlayContainer.style.zIndex = "1002";
-
- dialogRef.afterClosed().subscribe((response) => {
- this.overlayContainer.style.zIndex = null;
-
- if (response) {
- this.loadingService.setLoading(true);
-
- const read = response.substance;
-
- if (response.uuid && response.uuid != "register") {
- const url =
- "/substances/" + response.uuid + "/edit?action=import&source=draft";
- this.router.navigateByUrl(url, {
- state: { record: response.substance },
- });
- } else {
- setTimeout(() => {
- // this.overlayContainer.style.zIndex = null;
- this.router.onSameUrlNavigation = "reload";
- let url =
- "/substances/register/" +
- response.substance.substanceClass +
- "?action=import";
- this.router.navigateByUrl(url, {
- state: { record: response.substance },
- });
- }, 500);
- }
- }
});
+ this.subscriptions.push(authSub);
}
- /**
- * Updates privilege flags based on current auth state.
- * Called on init and whenever auth changes.
- */
- private async updatePrivileges(): Promise {
- try {
- this.canConfigureSystem =
- await this.authService.hasSpecificPrivilege("Configure System");
- this.canUserImportData =
- await this.authService.hasSpecificPrivilege("Import Data");
- this.canRegister = await this.authService.canEditData();
- this.canManageCVs =
- await this.authService.hasSpecificPrivilege("Manage CVs");
- } catch (e) {
- // Not authenticated or error - all privileges default to false
- this.canConfigureSystem = false;
- this.canUserImportData = false;
- this.canRegister = false;
- this.canManageCVs = false;
- }
+ ngOnDestroy(): void {
+ this.subscriptions.forEach((s) => s.unsubscribe());
}
}
diff --git a/src/app/core/bulk-search/bulk-query.component.scss b/src/app/core/bulk-search/bulk-query.component.scss
index c60f06d6e..4fdb49be0 100644
--- a/src/app/core/bulk-search/bulk-query.component.scss
+++ b/src/app/core/bulk-search/bulk-query.component.scss
@@ -1,65 +1,63 @@
.query-content-container {
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- padding: 65px 5px 0 5px;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 0 5px;
+
+ margin-bottom: 400px; /* ncats branch begin/end */
}
.mat-mdc-card {
- margin-top: 15px;
- box-sizing: border-box;
- max-width: 1170px;
- overflow-y: auto;
+ margin-top: 15px;
+ box-sizing: border-box;
+ max-width: 1170px;
+ overflow-y: auto;
}
.mat-mdc-radio-group {
- margin-top: 5px;
- margin-bottom: 10px;
+ margin-top: 5px;
+ margin-bottom: 10px;
}
.mat-mdc-radio-button {
- margin-right: 10px;
+ margin-right: 10px;
}
.editor-container {
- width: 920px;
- min-height: 460px;
+ width: 920px;
+ min-height: 460px;
}
-.query-actions {
-
- button {
- float: right;
- display: block;
- }
+.query-actions {
+ button {
+ float: right;
+ display: block;
+ }
}
-
.query-actions {
- flex-direction: row;
- width: 100%;
-
+ flex-direction: row;
+ width: 100%;
}
.two {
- width: auto;
- display: flex;
- flex-direction: column;
+ width: auto;
+ display: flex;
+ flex-direction: column;
}
.three {
- width: auto;
- display: flex;
- flex-direction: column;
+ width: auto;
+ display: flex;
+ flex-direction: column;
}
-
-@media(max-width: 1175px) { }
-
-@media(max-width: 970px) {
-
- .editor-container, .query-actions {
- width: 100%;
- }
+@media (max-width: 1175px) {
}
+@media (max-width: 970px) {
+ .editor-container,
+ .query-actions {
+ width: 100%;
+ }
+}
diff --git a/src/app/core/config/config.model.ts b/src/app/core/config/config.model.ts
index b1f14246c..aa1978e04 100644
--- a/src/app/core/config/config.model.ts
+++ b/src/app/core/config/config.model.ts
@@ -20,6 +20,9 @@ export interface Config {
homeHeader?: string;
homeContents?: string;
contactEmail?: string;
+
+ contactEmailAlt?: string; /* ncats branch begin/end */
+
defaultCodeSystem?: string;
primaryCode?: string;
typeaheadFields?: Array;
@@ -92,6 +95,15 @@ export interface Config {
enableStructureFeatures?: boolean;
StructureFeaturePriority?: Array;
structureEditSearch?: boolean;
+
+ /* ncats branch begin */
+ bannerText?: string;
+ showTopBanner?: boolean;
+ showLogin?: boolean;
+ showLoginButton?: boolean;
+ showFooter?: boolean;
+ /* ncats branch end */
+
editPagingOptionSettings?: PagingOptionSettings;
expandedComponents?: Array;
enablePDFDownload ?: DownloadAsPDF;
diff --git a/src/app/core/footer/footer.component.html b/src/app/core/footer/footer.component.html
new file mode 100644
index 000000000..a0dd34580
--- /dev/null
+++ b/src/app/core/footer/footer.component.html
@@ -0,0 +1,40 @@
+
+
+
+ @for (navItem of registerNav(); track navItem.display) {
+ @if (navItem.path) {
+ {{ navItem.display }}
+ }
+ @if (navItem.externalPath) {
+ {{ navItem.display }}
+ }
+ }
+ Import Substance
+
+
+
+ @for (navItem of searchNav(); track navItem.display) {
+ @if (navItem.path) {
+ {{ navItem.display }}
+ }
+ @if (navItem.externalPath) {
+ {{ navItem.display }}
+ }
+ }
+
+
+
+
+}
diff --git a/src/app/core/header/header.component.scss b/src/app/core/header/header.component.scss
new file mode 100644
index 000000000..00b8686ea
--- /dev/null
+++ b/src/app/core/header/header.component.scss
@@ -0,0 +1,94 @@
+@use "../../../styles/variables" as *;
+
+.version {
+ color: var(--version-text-color);
+ font-size: 10pt;
+ line-height: 10px;
+ text-align: right;
+ padding-top: 4px;
+ margin-right: -5px;
+ margin-bottom: -4px;
+}
+
+.logo-container {
+ display: flex;
+ flex-direction: column;
+ max-width: 160px;
+ margin-right: 20px;
+}
+
+.logo {
+ height: 35px;
+ margin-right: 20px;
+
+ img {
+ height: 100%;
+ width: auto;
+ }
+}
+
+.tooltiptest {
+ z-index: 9999 !important;
+ background: #b71c1c;
+}
+
+button.mat-mdc-button.top-button {
+ --button-icon-svg-size: 100%;
+ font-size: 16px;
+ color: white;
+ padding-right: 10px;
+ margin-right: 15px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+
+::ng-deep button.mat-mdc-button.top-button:hover {
+ background-color: rgb(71, 147, 209) !important;
+}
+
+.middle-fill {
+ flex: 1 1 auto;
+}
+
+.top-search {
+ flex-grow: 1;
+ max-width: 600px;
+}
+
+@media (min-width: $nav-breaking-point) {
+ .top-search {
+ min-width: 500px;
+ }
+}
+
+::ng-deep .transparent-background {
+ background-color: transparent;
+}
+
+.classic-view-container {
+ padding-left: 15px;
+}
+
+.registrar-dashboard-label {
+ font-size: 16px;
+ line-height: 1.2;
+ text-align: center;
+ display: inline-block;
+}
+
+.extra-item {
+ display: inline-block;
+}
+
+// hides Register/Search/Browse buttons below 1350px (only hamburger menu visible)
+@media (max-width: 1350px) {
+ .extra-item {
+ display: none !important;
+ }
+}
+
+@media (max-width: 1650px) {
+ .extra-item-2 {
+ display: none !important;
+ }
+}
diff --git a/src/app/core/header/header.component.ts b/src/app/core/header/header.component.ts
new file mode 100644
index 000000000..43902c1ae
--- /dev/null
+++ b/src/app/core/header/header.component.ts
@@ -0,0 +1,214 @@
+import {
+ ChangeDetectionStrategy,
+ Component,
+ effect,
+ inject,
+ OnDestroy,
+ OnInit,
+ signal,
+ ViewEncapsulation,
+} from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { BreakpointObserver } from "@angular/cdk/layout";
+import { OverlayContainer } from "@angular/cdk/overlay";
+import { MatButtonModule } from "@angular/material/button";
+import { MatDialog } from "@angular/material/dialog";
+import { MatIconModule } from "@angular/material/icon";
+import { MatMenuModule } from "@angular/material/menu";
+import { MatToolbarModule } from "@angular/material/toolbar";
+import { MatTooltipModule } from "@angular/material/tooltip";
+import { ActivatedRoute, Router, RouterLink } from "@angular/router";
+import { AuthService } from "@gsrs-core/auth";
+import { ConfigService } from "@gsrs-core/config";
+import { NavItem } from "../config/config.model";
+import { SubstanceEditImportDialogComponent } from "@gsrs-core/substance-edit-import-dialog/substance-edit-import-dialog.component";
+import { SubstanceTextSearchModule } from "@gsrs-core/substance-text-search/substance-text-search.module";
+import { SubstanceTextSearchService } from "@gsrs-core/substance-text-search/substance-text-search.service";
+import { UtilsService } from "@gsrs-core/utils";
+import { WildcardService } from "@gsrs-core/utils/wildcard.service";
+import { NavMenuComponent } from "./nav-menu/nav-menu.component";
+import { BrowseOtherMenuComponent } from "./browse-other-menu/browse-other-menu.component";
+import { UserMenuComponent } from "./user-menu/user-menu.component";
+import { map, Subscription, take } from "rxjs";
+import moment from "moment";
+
+@Component({
+ selector: "app-header",
+ imports: [
+ MatToolbarModule,
+ MatButtonModule,
+ MatIconModule,
+ MatMenuModule,
+ MatTooltipModule,
+ RouterLink,
+ SubstanceTextSearchModule,
+ NavMenuComponent,
+ BrowseOtherMenuComponent,
+ UserMenuComponent,
+ ],
+ templateUrl: "./header.component.html",
+ styleUrl: "./header.component.scss",
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ encapsulation: ViewEncapsulation.None,
+})
+export class HeaderComponent implements OnInit, OnDestroy {
+ private configService = inject(ConfigService);
+ private authService = inject(AuthService);
+ private activatedRoute = inject(ActivatedRoute);
+ private router = inject(Router);
+ private overlayContainerService = inject(OverlayContainer);
+ private breakpointObserver = inject(BreakpointObserver);
+ private utilsService = inject(UtilsService);
+ private substanceTextSearchService = inject(SubstanceTextSearchService);
+ private wildcardService = inject(WildcardService);
+ private dialog = inject(MatDialog);
+ private overlayContainer = this.overlayContainerService.getContainerElement();
+ private subscriptions: Subscription[] = [];
+
+ auth = toSignal(this.authService.getAuth(), { initialValue: null });
+ showRegistrars = toSignal(
+ this.breakpointObserver.observe("(min-width: 1611px)").pipe(map((r) => r.matches)),
+ { initialValue: true },
+ );
+ canRegister = signal(false);
+ canConfigureSystem = signal(false);
+ navItems = signal([]);
+
+ logoSrcPath = "";
+ showHeaderBar = "true";
+ customToolbarComponent = this.configService.configData.customToolbarComponent || "";
+ version = signal("");
+ versionTooltipMessage = signal("");
+ registerNav = signal([]);
+ searchNav = signal([]);
+ searchValue = signal("");
+
+ constructor() {
+ effect(() => {
+ const auth = this.auth();
+ if (auth) {
+ this.updatePrivileges();
+ } else {
+ this.canRegister.set(false);
+ this.canConfigureSystem.set(false);
+ }
+ });
+ }
+
+ async ngOnInit(): Promise {
+ const env = this.configService.environment;
+ this.logoSrcPath = `${env.baseHref || ""}assets/images/gsrs-logo.svg`;
+ this.showHeaderBar = this.activatedRoute.snapshot.queryParams["header"] || "true";
+
+ this.utilsService
+ .getBuildInfo()
+ .pipe(take(1))
+ .subscribe((buildInfo) => {
+ const v = this.configService.configData.version || buildInfo.version;
+ this.version.set(v);
+ this.versionTooltipMessage.set(`V${v} built on ${moment(new Date(buildInfo.buildTime)).utc().format("ddd MMM D YYYY HH:mm:ss z")}`);
+ });
+
+ const rawNavItems: NavItem[] = this.configService.configData.navItems || [];
+ const loaded = this.configService.configData.loadedComponents;
+ const filtered = [...rawNavItems];
+
+ if (loaded && Object.values(loaded).some((v) => v)) {
+ const loadedMap = loaded as Record;
+ for (let i = filtered.length - 1; i >= 0; i--) {
+ const children = filtered[i].children;
+ if (children) {
+ for (let j = children.length - 1; j >= 0; j--) {
+ const comp = children[j].component;
+ if (comp && !loadedMap[comp]) {
+ children.splice(j, 1);
+ }
+ }
+ }
+ const comp = filtered[i].component;
+ if (comp && !loadedMap[comp]) {
+ filtered.splice(i, 1);
+ }
+ }
+ }
+
+ const okToRegister = await this.authService.canEditData();
+ filtered.forEach((item) => {
+ if (item.display === "Register" && okToRegister) {
+ this.registerNav.set(item.children || []);
+ }
+ if (item.display === "Search") {
+ this.searchNav.set(item.children || []);
+ }
+ });
+ this.navItems.set(filtered);
+
+ if (this.activatedRoute.snapshot.queryParamMap.has("search")) {
+ this.searchValue.set(this.activatedRoute.snapshot.queryParamMap.get("search") ?? "");
+ }
+ this.subscriptions.push(
+ this.activatedRoute.queryParamMap.subscribe((params) => {
+ this.searchValue.set(params.get("search") ?? "");
+ }),
+ );
+
+ this.substanceTextSearchService.registerSearchComponent("main-substance-search");
+ this.subscriptions.push(
+ this.substanceTextSearchService
+ .setSearchComponentValueEvent("main-substance-search")
+ .subscribe((value) => {
+ this.searchValue.set(value);
+ }),
+ );
+ }
+
+ ngOnDestroy(): void {
+ this.subscriptions.forEach((s) => s.unsubscribe());
+ }
+
+ processSubstanceSearch(searchValue: string): void {
+ this.wildcardService.getTopSearchBoxText(searchValue);
+ this.router.navigate(["/browse-substance"], {
+ queryParams: searchValue ? { search: searchValue } : null,
+ });
+ }
+
+ increaseMenuZindex(): void {
+ this.overlayContainer.style.zIndex = "1001";
+ }
+
+ removeZindex(): void {
+ this.overlayContainer.style.removeProperty("z-index");
+ }
+
+ importDialog(): void {
+ const dialogRef = this.dialog.open(SubstanceEditImportDialogComponent, {
+ width: "650px",
+ autoFocus: false,
+ });
+ this.overlayContainer.style.zIndex = "1002";
+ dialogRef
+ .afterClosed()
+ .pipe(take(1))
+ .subscribe((response) => {
+ if (response) {
+ this.overlayContainer.style.removeProperty("z-index");
+ this.router.navigateByUrl("/substances/register?action=import", {
+ state: { record: response },
+ });
+ }
+ });
+ }
+
+ private async updatePrivileges(): Promise {
+ try {
+ this.canRegister.set(await this.authService.canEditData());
+ this.canConfigureSystem.set(
+ await this.authService.hasSpecificPrivilege("Configure System"),
+ );
+ } catch {
+ this.canRegister.set(false);
+ this.canConfigureSystem.set(false);
+ }
+ }
+}
diff --git a/src/app/core/header/nav-menu/nav-menu.component.html b/src/app/core/header/nav-menu/nav-menu.component.html
new file mode 100644
index 000000000..8c8eda498
--- /dev/null
+++ b/src/app/core/header/nav-menu/nav-menu.component.html
@@ -0,0 +1,53 @@
+
diff --git a/src/app/core/header/nav-menu/nav-menu.component.scss b/src/app/core/header/nav-menu/nav-menu.component.scss
new file mode 100644
index 000000000..2a2b33e17
--- /dev/null
+++ b/src/app/core/header/nav-menu/nav-menu.component.scss
@@ -0,0 +1,13 @@
+.nav-small {
+ padding-right: 10px;
+
+ button[mat-icon-button] {
+ width: 50px;
+ height: 50px;
+ }
+
+ .mat-icon {
+ width: 40px !important;
+ height: 40px !important;
+ }
+}
diff --git a/src/app/core/header/nav-menu/nav-menu.component.ts b/src/app/core/header/nav-menu/nav-menu.component.ts
new file mode 100644
index 000000000..bdbecebbc
--- /dev/null
+++ b/src/app/core/header/nav-menu/nav-menu.component.ts
@@ -0,0 +1,78 @@
+import { ChangeDetectionStrategy, Component, inject, input, ViewEncapsulation } from "@angular/core";
+import { OverlayContainer } from "@angular/cdk/overlay";
+import { MatButtonModule } from "@angular/material/button";
+import { MatDialog } from "@angular/material/dialog";
+import { MatIconModule } from "@angular/material/icon";
+import { MatMenuModule } from "@angular/material/menu";
+import { Router, RouterLink } from "@angular/router";
+import { ConfigService } from "@gsrs-core/config";
+import { NavItem } from "../../config/config.model";
+import { SubstanceEditImportDialogComponent } from "@gsrs-core/substance-edit-import-dialog/substance-edit-import-dialog.component";
+import { sprintf } from "sprintf-js";
+import { take } from "rxjs/operators";
+
+@Component({
+ selector: "app-nav-menu",
+ imports: [MatButtonModule, MatIconModule, MatMenuModule, RouterLink],
+ templateUrl: "./nav-menu.component.html",
+ styleUrl: "./nav-menu.component.scss",
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ encapsulation: ViewEncapsulation.None,
+})
+export class NavMenuComponent {
+ private configService = inject(ConfigService);
+ private overlayContainerService = inject(OverlayContainer);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private overlayContainer = this.overlayContainerService.getContainerElement();
+
+ navItems = input([]);
+ canRegister = input(false);
+ canConfigureSystem = input(false);
+
+ private contactEmail = this.configService.configData.contactEmail || "";
+ private contactEmailAlt = this.configService.configData.contactEmailAlt || "";
+
+ increaseMenuZindex(): void {
+ this.overlayContainer.style.zIndex = "1001";
+ }
+
+ removeZindex(): void {
+ this.overlayContainer.style.removeProperty("z-index");
+ }
+
+ transformMailToPath(item: NavItem): string {
+ if (item?.kind && item?.mailToPath) {
+ let email = "";
+ if (item.kind === "contact-us") {
+ email = this.contactEmail;
+ }
+ if (item.kind === "contact-us-alt") {
+ email = this.contactEmailAlt;
+ }
+ const subject = item?.queryParams?.subject || "";
+ const part1 = sprintf(item.mailToPath, email);
+ return part1 + "?" + (subject ? "subject=" + subject : "");
+ }
+ return "";
+ }
+
+ importDialog(): void {
+ const dialogRef = this.dialog.open(SubstanceEditImportDialogComponent, {
+ width: "650px",
+ autoFocus: false,
+ });
+ this.overlayContainer.style.zIndex = "1002";
+ dialogRef
+ .afterClosed()
+ .pipe(take(1))
+ .subscribe((response) => {
+ if (response) {
+ this.overlayContainer.style.removeProperty("z-index");
+ this.router.navigateByUrl("/substances/register?action=import", {
+ state: { record: response },
+ });
+ }
+ });
+ }
+}
diff --git a/src/app/core/header/user-menu/user-menu.component.html b/src/app/core/header/user-menu/user-menu.component.html
new file mode 100644
index 000000000..aa25527c3
--- /dev/null
+++ b/src/app/core/header/user-menu/user-menu.component.html
@@ -0,0 +1,62 @@
+();
+ auth = toSignal(this.authService.getAuth());
+ showLoginButton = this.configService.configData.showLoginButton !== false;
+
+ canConfigureSystem = signal(false);
+ canUserImportData = signal(false);
+ canManageCVs = signal(false);
+ canRegister = signal(false);
+
+ isLoginPage = toSignal(
+ this.router.events.pipe(
+ filter((e) => e instanceof NavigationEnd),
+ map(() => this.router.url.startsWith("/login")),
+ startWith(this.router.url.startsWith("/login")),
+ ),
+ );
+
+ constructor() {
+ effect(() => {
+ const auth = this.auth();
+ if (auth) {
+ this.updatePrivileges();
+ } else {
+ this.canConfigureSystem.set(false);
+ this.canUserImportData.set(false);
+ this.canRegister.set(false);
+ this.canManageCVs.set(false);
+ }
+ });
+ }
+
+ increaseMenuZindex(): void {
+ this.overlayContainer.style.zIndex = "1001";
+ }
+
+ removeZindex(): void {
+ this.overlayContainer.style.removeProperty("z-index");
+ }
+
+ routeToLogin(): void {
+ this.router.navigate(["/login"], { queryParams: { path: this.router.url } });
+ }
+
+ openProfile(): void {
+ const dialogRef = this.dialog.open(UserProfileComponent, { data: {}, width: "800px" });
+ this.overlayContainer.style.zIndex = "1002";
+ dialogRef.afterClosed().pipe(take(1)).subscribe(() => {
+ this.overlayContainer.style.removeProperty("z-index");
+ });
+ }
+
+ viewLists(): void {
+ const dialogRef = this.dialog.open(UserQueryListDialogComponent, {
+ width: "850px",
+ autoFocus: false,
+ data: { view: "all" },
+ });
+ this.overlayContainer.style.zIndex = "1002";
+ dialogRef.afterClosed().pipe(take(1)).subscribe(() => {
+ this.overlayContainer.style.removeProperty("z-index");
+ });
+ }
+
+ viewDrafts(): void {
+ const dialogRef = this.dialog.open(SubstanceDraftsComponent, {
+ maxHeight: "85%",
+ width: "70%",
+ data: { view: "user" },
+ });
+ this.overlayContainer.style.zIndex = "1002";
+
+ dialogRef.afterClosed().pipe(take(1)).subscribe((response) => {
+ this.overlayContainer.style.removeProperty("z-index");
+ if (response) {
+ this.loadingService.setLoading(true);
+ if (response.uuid && response.uuid !== "register") {
+ this.router.navigateByUrl(
+ `/substances/${response.uuid}/edit?action=import&source=draft`,
+ { state: { record: response.substance } },
+ );
+ } else {
+ setTimeout(() => {
+ this.router.navigateByUrl(
+ `/substances/register/${response.substance.substanceClass}?action=import`,
+ { state: { record: response.substance } },
+ );
+ }, 500);
+ }
+ }
+ });
+ }
+
+ logout(): void {
+ this.authService.logout();
+ setTimeout(() => {
+ if (this.configService.configData?.logoutRedirectUrl) {
+ window.location.href = this.configService.configData.logoutRedirectUrl;
+ } else {
+ this.router.navigate(["/home"]);
+ }
+ }, 1200);
+ }
+
+ private async updatePrivileges(): Promise {
+ try {
+ this.canConfigureSystem.set(await this.authService.hasSpecificPrivilege("Configure System"));
+ this.canUserImportData.set(await this.authService.hasSpecificPrivilege("Import Data"));
+ this.canRegister.set(await this.authService.canEditData());
+ this.canManageCVs.set(await this.authService.hasSpecificPrivilege("Manage CVs"));
+ } catch {
+ this.canConfigureSystem.set(false);
+ this.canUserImportData.set(false);
+ this.canRegister.set(false);
+ this.canManageCVs.set(false);
+ }
+ }
+}
diff --git a/src/app/core/main-notification/main-notification.module.ts b/src/app/core/main-notification/main-notification.module.ts
index 7a592f9de..b9e8054d2 100644
--- a/src/app/core/main-notification/main-notification.module.ts
+++ b/src/app/core/main-notification/main-notification.module.ts
@@ -1,20 +1,8 @@
import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MainNotificationService } from './main-notification.service';
import { MainNotificationComponent } from './main-notification/main-notification.component';
@NgModule({
- imports: [
- CommonModule
- ],
- declarations: [
- MainNotificationComponent
- ],
- providers: [
- MainNotificationService
- ],
- exports: [
- MainNotificationComponent
- ]
+ imports: [MainNotificationComponent],
+ exports: [MainNotificationComponent],
})
export class MainNotificationModule { }
diff --git a/src/app/core/main-notification/main-notification.service.ts b/src/app/core/main-notification/main-notification.service.ts
index 26dcad2c7..bc6a208cc 100644
--- a/src/app/core/main-notification/main-notification.service.ts
+++ b/src/app/core/main-notification/main-notification.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Subject } from 'rxjs';
import { AppNotification, NotificationType } from './notification.model';
-@Injectable()
+@Injectable({ providedIn: 'root' })
export class MainNotificationService {
notificationEvent: Subject = new Subject();
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.html b/src/app/core/main-notification/main-notification/main-notification.component.html
index ced635246..df46ba93d 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.html
+++ b/src/app/core/main-notification/main-notification/main-notification.component.html
@@ -1,4 +1,3 @@
-
+ = [];
-
- constructor(
- private notificationService: MainNotificationService
- ) { }
-
- ngOnInit() {
- this.appNotification.nativeElement.classList.add('hidden');
- const subscription = this.notificationService.notificationEvent.subscribe(notification => {
- this.setNotification(notification);
- });
- this.subscriptions.push(subscription);
- }
-
- ngOnDestroy() {
- this.subscriptions.forEach(subscription => {
- subscription.unsubscribe();
- });
- clearTimeout(this.notificationTimer);
- }
-
- // If notification.milisecondsToShow === 0, the notification is permanent (until closed by user)
- setNotification(notification: AppNotification): void {
- this.notifcationType = notification.type || NotificationType.default;
- this.notificationMessage = notification.message;
- this.appNotification.nativeElement.classList.remove('hidden');
- this.appNotification.nativeElement.classList.add(NotificationType[this.notifcationType]);
- this.appNotification.nativeElement.classList.add('showing');
- if (notification.milisecondsToShow === 0) {
- if (this.notificationTimer != null) {
- clearTimeout(this.notificationTimer);
- }
- this.notificationTimer = null;
- } else {
- const timeout = notification.milisecondsToShow || 5000;
- this.notificationTimer = setTimeout(() => {
- this.removeNotification();
- this.notificationTimer = null;
- }, timeout);
- }
- }
-
- removeNotification(): void {
- if (this.notificationTimer != null) {
- clearTimeout(this.notificationTimer);
- }
- this.appNotification.nativeElement.classList.remove('showing');
- this.appNotification.nativeElement.classList.add('hidden');
- this.appNotification.nativeElement.classList.remove(NotificationType[this.notifcationType]);
- }
-}
+ selector: "app-main-notification",
+ imports: [NgClass],
+ templateUrl: "./main-notification.component.html",
+ styleUrl: "./main-notification.component.scss",
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MainNotificationComponent {
+ private notificationService = inject(MainNotificationService);
+ private destroyRef = inject(DestroyRef);
+
+ private isVisible = signal(false);
+ private notificationType = signal(NotificationType.default);
+ notificationMessage = signal("");
+
+ protected readonly classes = computed(() => ({
+ hidden: !this.isVisible(),
+ showing: this.isVisible(),
+ default: this.notificationType() === NotificationType.default,
+ success: this.notificationType() === NotificationType.success,
+ error: this.notificationType() === NotificationType.error,
+ }));
+
+ private notificationTimer: ReturnType | null = null;
+
+ constructor() {
+ this.notificationService.notificationEvent
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe((notification) => this.setNotification(notification));
+
+ this.destroyRef.onDestroy(() => {
+ if (this.notificationTimer !== null) clearTimeout(this.notificationTimer);
+ });
+ }
+
+ // If notification.milisecondsToShow === 0, the notification is permanent (until closed by user)
+ setNotification(notification: AppNotification): void {
+ this.notificationType.set(notification.type ?? NotificationType.default);
+ this.notificationMessage.set(notification.message);
+ this.isVisible.set(true);
+
+ if (notification.milisecondsToShow === 0) {
+ if (this.notificationTimer !== null) {
+ clearTimeout(this.notificationTimer);
+ this.notificationTimer = null;
+ }
+ } else {
+ const timeout = notification.milisecondsToShow ?? 5000;
+ if (this.notificationTimer !== null) clearTimeout(this.notificationTimer);
+ this.notificationTimer = setTimeout(() => {
+ this.removeNotification();
+ this.notificationTimer = null;
+ }, timeout);
+ }
+ }
+
+ removeNotification(): void {
+ if (this.notificationTimer !== null) {
+ clearTimeout(this.notificationTimer);
+ this.notificationTimer = null;
+ }
+ this.isVisible.set(false);
+ }
+}
diff --git a/src/app/core/misc/top-banner.component.html b/src/app/core/misc/top-banner.component.html
new file mode 100644
index 000000000..c19c64e6f
--- /dev/null
+++ b/src/app/core/misc/top-banner.component.html
@@ -0,0 +1,5 @@
+
diff --git a/src/app/core/misc/top-banner.component.scss b/src/app/core/misc/top-banner.component.scss
new file mode 100644
index 000000000..a34e47208
--- /dev/null
+++ b/src/app/core/misc/top-banner.component.scss
@@ -0,0 +1,38 @@
+.top-banner-text {
+ font-size: 16px;
+ font-weight: 600;
+ width: 900px !important;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: auto;
+ margin-left: auto;
+}
+
+@media screen and (max-width: 768px) {
+ .top-banner-text {
+ width: 300px !important;
+ }
+}
+
+.top-banner {
+ width: 100%;
+ padding: 5px;
+ font-family: Arial, Helvetica, sans-serif;
+ text-align: center;
+ align-content: center;
+ color: #4793d1;
+ background-color: white;
+ overflow-x: hidden;
+ overflow-y: hidden;
+ white-space: nowrap;
+}
+.top-banner:hover {
+ max-height: fit-content;
+ overflow-x: hidden;
+ overflow-y: visible;
+ white-space: wrap;
+}
+
+.top-banner:hover .top-banner-text {
+ width: 100% !important;
+}
diff --git a/src/app/core/misc/top-banner.component.ts b/src/app/core/misc/top-banner.component.ts
new file mode 100644
index 000000000..f630af9ad
--- /dev/null
+++ b/src/app/core/misc/top-banner.component.ts
@@ -0,0 +1,21 @@
+import { Component, inject, OnInit, signal } from "@angular/core";
+import { ConfigService } from "../config/config.service";
+
+@Component({
+ selector: "app-top-banner",
+ templateUrl: "./top-banner.component.html",
+ styleUrls: ["./top-banner.component.scss"],
+ standalone: false,
+})
+export class TopBannerComponent implements OnInit {
+ public configService = inject(ConfigService);
+ bannerText = signal(
+ "This repository is under review for potential modification in compliance with Administration directives.",
+ );
+
+ ngOnInit() {
+ if (this.configService.configData.bannerText) {
+ this.bannerText.set(this.configService.configData.bannerText);
+ }
+ }
+}
diff --git a/src/app/core/registrars/registrars.component.scss b/src/app/core/registrars/registrars.component.scss
index 8af854bb1..1cf62e4bb 100644
--- a/src/app/core/registrars/registrars.component.scss
+++ b/src/app/core/registrars/registrars.component.scss
@@ -2,7 +2,7 @@
display: flex;
justify-content: center;
padding-top: 0px;
- margin-top: 75px;
+ margin-top: 25px;
}
.button-container {
diff --git a/src/app/core/sequence-search/sequence-search.component.scss b/src/app/core/sequence-search/sequence-search.component.scss
index 82801dcf4..47971f41d 100644
--- a/src/app/core/sequence-search/sequence-search.component.scss
+++ b/src/app/core/sequence-search/sequence-search.component.scss
@@ -3,7 +3,8 @@
flex-direction: column;
align-items: center;
justify-content: center;
- padding: 65px 5px 0 5px;
+ padding: 0 5px 0 5px;
+ margin-bottom: 400px; /* ncats branch begin/end */
}
.sequence-search-card {
diff --git a/src/app/core/spacers/top-content-spacer.component.html b/src/app/core/spacers/top-content-spacer.component.html
new file mode 100644
index 000000000..53439ecbc
--- /dev/null
+++ b/src/app/core/spacers/top-content-spacer.component.html
@@ -0,0 +1,4 @@
+
+
+
\ No newline at end of file
diff --git a/src/app/core/spacers/top-content-spacer.component.scss b/src/app/core/spacers/top-content-spacer.component.scss
new file mode 100644
index 000000000..8bcdf19f8
--- /dev/null
+++ b/src/app/core/spacers/top-content-spacer.component.scss
@@ -0,0 +1,9 @@
+/* ncats branch, used in base component to allow
+space above all content pages */
+
+.top-content-spacer {
+ height: 100px;
+ clear: both;
+ width: 100%;
+ border: 1px solid blue;
+}
\ No newline at end of file
diff --git a/src/app/core/spacers/top-content-spacer.component.ts b/src/app/core/spacers/top-content-spacer.component.ts
new file mode 100644
index 000000000..2202b42e1
--- /dev/null
+++ b/src/app/core/spacers/top-content-spacer.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+@Component({
+ selector: 'app-top-content-spacer',
+ templateUrl: './top-content-spacer.component.html',
+ styleUrls: ['./top-content-spacer.component.scss'],
+ standalone: false
+})
+export class TopContentSpacerComponent implements OnInit {
+ height : 0;
+ constructor(
+ ){ }
+ ngOnInit(){
+ }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/app/core/structure-search/structure-search.component.scss b/src/app/core/structure-search/structure-search.component.scss
index 44b3a54fc..7fe0047f0 100644
--- a/src/app/core/structure-search/structure-search.component.scss
+++ b/src/app/core/structure-search/structure-search.component.scss
@@ -4,7 +4,8 @@
flex-direction: column;
align-items: center;
justify-content: center;
- padding: 65px 5px 0 5px;
+ padding: 20px 5px 0 5px;
+ margin-bottom: 400px; /* ncats branch begin/end */
}
.mat-card-title {
diff --git a/src/app/core/substance-details/substance-details.component.html b/src/app/core/substance-details/substance-details.component.html
index f66f76e9a..6a315ddc2 100644
--- a/src/app/core/substance-details/substance-details.component.html
+++ b/src/app/core/substance-details/substance-details.component.html
@@ -84,3 +84,4 @@
+
diff --git a/src/app/core/substance-form/substance-form.component.html b/src/app/core/substance-form/substance-form.component.html
index b218b3dab..446f8e076 100644
--- a/src/app/core/substance-form/substance-form.component.html
+++ b/src/app/core/substance-form/substance-form.component.html
@@ -13,8 +13,9 @@
/>
-
-
-
- {{ auth.identifier.length > 9 ? (auth.identifier | slice:0:9) + '…' : auth.identifier }}
+
+
-
- Profile
-
-
- User Downloads
-
-
- User Saved Lists
-
-
- Saved Edit Drafts
-
-
- Import Data
-
-
- Legacy Data Import
-
-
- CV Management
-
-
- Admin Panel
-
-
- Registrar Dashboard
-
-
-
-
-
+
-
-
+
+ @if (showFooter) {
+
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss
new file mode 100644
index 000000000..713b52ffb
--- /dev/null
+++ b/src/app/core/footer/footer.component.scss
@@ -0,0 +1,46 @@
+.content-container {
+ width: 100%;
+ height: 100px;
+ background: #4793d1;
+ color: #fff;
+ padding: 10px;
+ overflow: hidden;
+}
+
+.footer-row {
+ margin-top: 3px;
+ display: flex;
+ width: 100%;
+ color: WhiteSmoke;
+ justify-content: center;
+}
+
+
+.footer-row a {
+ color: WhiteSmoke;
+ text-decoration: none;
+}
+
+@media (max-width:800px) {
+.parent-nf {
+ flex: none;
+ display: block;
+ width: 100%;
+}
+.separator {
+ display: none;
+}
+.link {
+ flex: none;
+ display: block;
+ width: 100%;
+ text-align: center;
+}
+.fragment {
+ flex: none;
+ display: block;
+ width: 100%;
+ text-align: center;
+}
+
+}
diff --git a/src/app/core/footer/footer.component.ts b/src/app/core/footer/footer.component.ts
new file mode 100644
index 000000000..f35f2673a
--- /dev/null
+++ b/src/app/core/footer/footer.component.ts
@@ -0,0 +1,44 @@
+import { HttpClient } from '@angular/common/http';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ConfigService } from '@gsrs-core/config';
+import { fromEvent, throttleTime } from 'rxjs';
+import { filter, first, map, tap } from 'rxjs/operators';
+
+@Component({
+ selector: 'app-footer',
+ templateUrl: './footer.component.html',
+ styleUrl: './footer.component.scss',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FooterComponent implements OnInit {
+ bottom : number = 0;
+ htmlText;
+ constructor(
+ private http:HttpClient,
+ private sanitizer:DomSanitizer,
+ private configService: ConfigService
+ ){ }
+ ngOnInit(){
+ // const privacyStatement = this.configService.configData.privacyStatement;
+ // if(privacyStatement) {
+ // // if used, privacyStatement should be a json encoded string in config.json
+ // this.htmlText = this.sanitizer.bypassSecurityTrustHtml(privacyStatement);
+ // } else {
+ // // if used overwrite this file with a simple html version of your privacy statement.
+ // this.http.get('assets/html/privacy-statement.html',{responseType:'text'}).subscribe(result=>{
+ // this.htmlText = this.sanitizer.bypassSecurityTrustHtml(result);
+ // }, error => {
+ // this.htmlText = "Error fetching page content";
+ // });
+ // }
+
+
+
+ }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/app/core/header/browse-other-menu/browse-other-menu.component.html b/src/app/core/header/browse-other-menu/browse-other-menu.component.html
new file mode 100644
index 000000000..fc9e1952e
--- /dev/null
+++ b/src/app/core/header/browse-other-menu/browse-other-menu.component.html
@@ -0,0 +1,43 @@
+@if (loadedComponents && showBrowseOther()) {
+
+
+
+ @if (loadedComponents.applications) {
+ Browse Applications
+
+
+}
diff --git a/src/app/core/header/browse-other-menu/browse-other-menu.component.scss b/src/app/core/header/browse-other-menu/browse-other-menu.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/core/header/browse-other-menu/browse-other-menu.component.ts b/src/app/core/header/browse-other-menu/browse-other-menu.component.ts
new file mode 100644
index 000000000..b397b01c0
--- /dev/null
+++ b/src/app/core/header/browse-other-menu/browse-other-menu.component.ts
@@ -0,0 +1,43 @@
+import { BreakpointObserver } from "@angular/cdk/layout";
+import { OverlayContainer } from "@angular/cdk/overlay";
+import { ChangeDetectionStrategy, Component, inject, ViewEncapsulation } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { MatButtonModule } from "@angular/material/button";
+import { MatDividerModule } from "@angular/material/divider";
+import { MatIconModule } from "@angular/material/icon";
+import { MatMenuModule } from "@angular/material/menu";
+import { RouterLink } from "@angular/router";
+import { ConfigService } from "@gsrs-core/config";
+import { map } from "rxjs";
+
+@Component({
+ selector: "app-browse-other-menu",
+ imports: [MatButtonModule, MatIconModule, MatMenuModule, MatDividerModule, RouterLink],
+ templateUrl: "./browse-other-menu.component.html",
+ styleUrl: "./browse-other-menu.component.scss",
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ encapsulation: ViewEncapsulation.None,
+})
+export class BrowseOtherMenuComponent {
+ private configService = inject(ConfigService);
+ private overlayContainerService = inject(OverlayContainer);
+ private breakpointObserver = inject(BreakpointObserver);
+ private overlayContainer = this.overlayContainerService.getContainerElement();
+
+ loadedComponents = this.configService.configData.loadedComponents || null;
+ adverseEventShinyHomepageDisplay = this.configService.configData.adverseEventShinyHomepageDisplay === 'true';
+ adverseEventShinyHomepageURL = this.configService.configData.adverseEventShinyHomepageURL;
+
+ showBrowseOther = toSignal(
+ this.breakpointObserver.observe("(min-width: 1501px)").pipe(map((r) => r.matches)),
+ { initialValue: true },
+ );
+
+ increaseMenuZindex(): void {
+ this.overlayContainer.style.zIndex = "1001";
+ }
+
+ removeZindex(): void {
+ this.overlayContainer.style.removeProperty("z-index");
+ }
+}
diff --git a/src/app/core/header/header.component.html b/src/app/core/header/header.component.html
new file mode 100644
index 000000000..bf159521a
--- /dev/null
+++ b/src/app/core/header/header.component.html
@@ -0,0 +1,117 @@
+@if (showHeaderBar === "true" && (!customToolbarComponent || customToolbarComponent.length === 0)) {
+
+
+
+ ![gsrs-logo]()
+
+
+ @if (version() && version() !== "") {
+ Ver. {{ version() }}
+ }
+
+
+
+
+
+
+
+ @if (canRegister()) {
+
+ }
+
+
+
+
+ @if (canRegister()) {
+
+ }
+
+ }
+
+ @if (showLoginButton) {
+
+ Profile
+ User Downloads
+ User Saved Lists
+ Saved Edit Drafts
+ @if (canUserImportData() && !canConfigureSystem()) {
+ Import Data
+ Legacy Data Import
+ }
+ @if (canManageCVs() && !canConfigureSystem()) {
+ CV Management
+ }
+ @if (canConfigureSystem()) {
+ Admin Panel
+ }
+ @if (canRegister() && !showRegistrars()) {
+
+ Registrar Dashboard
+
+ }
+
+
+
diff --git a/src/app/core/header/user-menu/user-menu.component.scss b/src/app/core/header/user-menu/user-menu.component.scss
new file mode 100644
index 000000000..e32c4a814
--- /dev/null
+++ b/src/app/core/header/user-menu/user-menu.component.scss
@@ -0,0 +1,118 @@
+.user-section {
+ position: relative;
+}
+
+.login-link {
+ color: white !important;
+ font-size: 16px;
+ text-decoration: none;
+}
+
+.user {
+ font-size: 12px;
+ letter-spacing: 0.4px;
+ color: var(--regular-white-color);
+ white-space: nowrap;
+}
+
+.arrow-button {
+ margin-left: -13px !important;
+ height: 25px !important;
+ width: 25px !important;
+}
+
+.user-button {
+ margin-bottom: -5px;
+
+ ::ng-deep mat-icon {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ }
+
+ ::ng-deep svg {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ }
+
+ mat-icon {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ }
+
+ svg {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ }
+}
+
+.icon-two {
+ height: 24px !important;
+ margin-left: 4px;
+ width: 24px !important;
+
+ svg {
+ height: 25px !important;
+ width: 25px !important;
+ }
+}
+
+.logged-in {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .user-actions {
+ display: flex;
+ align-items: center;
+ position: relative;
+ z-index: 3;
+
+ .user-button.mat-mdc-icon-button {
+ --mat-icon-button-icon-size: 30px;
+ color: var(--regular-white-color);
+
+ ::ng-deep .mat-icon {
+ color: var(--regular-white-color);
+ height: 30px !important;
+ width: 30px !important;
+ }
+
+ ::ng-deep svg {
+ fill: var(--regular-white-color);
+ height: 30px !important;
+ width: 30px !important;
+ }
+ }
+ }
+
+ .mat-icon,
+ user-icon {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ line-height: unset;
+ color: white;
+ }
+
+ ::ng-deep svg {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+ }
+}
+
+.logged-in .user-actions .mat-icon {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+}
+
+.mat-icon .user-icon {
+ height: 30px;
+ width: 30px;
+ margin-bottom: -10px;
+}
diff --git a/src/app/core/header/user-menu/user-menu.component.ts b/src/app/core/header/user-menu/user-menu.component.ts
new file mode 100644
index 000000000..142d69654
--- /dev/null
+++ b/src/app/core/header/user-menu/user-menu.component.ts
@@ -0,0 +1,159 @@
+import { ChangeDetectionStrategy, Component, effect, inject, input, signal, ViewEncapsulation } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { OverlayContainer } from "@angular/cdk/overlay";
+import { MatButtonModule } from "@angular/material/button";
+import { MatDialog } from "@angular/material/dialog";
+import { MatIconModule } from "@angular/material/icon";
+import { MatMenuModule } from "@angular/material/menu";
+import { MatTooltipModule } from "@angular/material/tooltip";
+import { NavigationEnd, Router, RouterLink } from "@angular/router";
+import { AuthService } from "@gsrs-core/auth";
+import { ConfigService } from "@gsrs-core/config";
+import { LoadingService } from "@gsrs-core/loading";
+import { UserProfileComponent } from "@gsrs-core/auth/user-profile/user-profile.component";
+import { UserQueryListDialogComponent } from "@gsrs-core/bulk-search/user-query-list-dialog/user-query-list-dialog.component";
+import { SubstanceDraftsComponent } from "@gsrs-core/substance-form/substance-drafts/substance-drafts.component";
+import { SlicePipe } from "@angular/common";
+import { filter, map, startWith, take } from "rxjs";
+
+@Component({
+ selector: "app-user-menu",
+ imports: [
+ MatButtonModule,
+ MatIconModule,
+ MatMenuModule,
+ MatTooltipModule,
+ RouterLink,
+ SlicePipe,
+ ],
+ templateUrl: "./user-menu.component.html",
+ styleUrl: "./user-menu.component.scss",
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ encapsulation: ViewEncapsulation.None,
+})
+export class UserMenuComponent {
+ private authService = inject(AuthService);
+ private configService = inject(ConfigService);
+ private dialog = inject(MatDialog);
+ private overlayContainerService = inject(OverlayContainer);
+ private loadingService = inject(LoadingService);
+ private router = inject(Router);
+ private overlayContainer = this.overlayContainerService.getContainerElement();
+
+ showRegistrars = input
+ @if (!auth() && !isLoginPage()) {
+
+ }
+
+ }
+ @if (auth()) {
+
+
+ }
+
+
+
+
+ @if (auth()?.identifier) {
+ {{
+ auth()!.identifier.length > 9
+ ? (auth()!.identifier | slice: 0 : 9) + "…"
+ : auth()!.identifier
+ }}
+ }
+
+ {{ notificationMessage() }}
+
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.scss b/src/app/core/main-notification/main-notification/main-notification.component.scss
index 352a4511d..328ba10e0 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.scss
+++ b/src/app/core/main-notification/main-notification/main-notification.component.scss
@@ -3,14 +3,11 @@
.main-notification {
width: 100%;
text-align: center;
- position: fixed;
- z-index: 2000;
transition: all 200ms ease;
overflow: hidden;
box-sizing: border-box;
padding: 10px;
font-weight: 500;
- top: 64px;
&.hidden {
height: 0;
diff --git a/src/app/core/main-notification/main-notification/main-notification.component.ts b/src/app/core/main-notification/main-notification/main-notification.component.ts
index ee5747578..1f0db689a 100644
--- a/src/app/core/main-notification/main-notification/main-notification.component.ts
+++ b/src/app/core/main-notification/main-notification/main-notification.component.ts
@@ -1,67 +1,70 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { MainNotificationService } from '../main-notification.service';
-import { AppNotification, NotificationType } from '../notification.model';
-import { Subscription } from 'rxjs';
-
+import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject, signal } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { NgClass } from "@angular/common";
+import { MainNotificationService } from "../main-notification.service";
+import { AppNotification, NotificationType } from "../notification.model";
+
@Component({
- selector: 'app-main-notification',
- templateUrl: './main-notification.component.html',
- styleUrls: ['./main-notification.component.scss'],
- standalone: false
-})
-export class MainNotificationComponent implements OnInit, OnDestroy {
- @ViewChild('notification', { static: true }) appNotification: { nativeElement: HTMLElement };
- private notificationTimer: any;
- private notifcationType: NotificationType;
- public notificationMessage: string;
- private subscriptions: Array{{ property.title }}
-
+
+
+
+
New Class
@@ -253,7 +255,7 @@
*ngTemplateOutlet="substanceSubmissionMessages"
>
-
+
@@ -287,7 +289,7 @@
+
+
-
+ {{ section.menuLabel }}
mat-flat-button color="primary" id="Add new {{ section.menuLabel }}" - (click)="section.addItem(); $event.stopPropagation()" + (click)="section.addItem(); $event.stopPropagation()" matTooltip="Add new {{ section.menuLabel }}" > Add {{ section.menuLabel }} @@ -316,7 +318,7 @@{{ section.menuLabel }}
{{ submissionMessage }}
-
+
@@ -346,18 +348,18 @@
-
-
+ {{ section.menuLabel }}
>{{ link.text }} -
@@ -388,7 +390,7 @@
{{ section.menuLabel }}
" > Confirm Approval - +{{ section.menuLabel }}
+
\ No newline at end of file
+
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
index 902fc4561..696042e3d 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.scss
@@ -7,12 +7,12 @@
left: 0;
right: 0;
bottom: 0;
- background-color: rgba(0,0,0,0.5); /* Black background with opacity */
+ background-color: rgba(0, 0, 0, 0.5); /* Black background with opacity */
z-index: 2; /* Specify a stack order in case you're using a different order for other elements */
cursor: pointer; /* Add a pointer on hover */
}
.hide {
- display: none!important;
+ display: none !important;
}
.center-screen {
z-index: 2;
@@ -48,33 +48,36 @@
cursor: pointer;
}
.top-fixed {
- position: fixed;
- display: flex;
- flex-direction: column;
- top: 64px;
- width: 100%;
- background-color: white;
- align-items: center;
- justify-content: center;
- box-shadow: 0px 3px 3px -2px rgba(0, 0, 0, 0.2), 0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
- z-index: 1001;
+ position: sticky;
+ display: flex;
+ flex-direction: column;
+ top: 0;
+ width: 100%;
+ background-color: white;
+ align-items: center;
+ justify-content: center;
+ box-shadow:
+ 0px 3px 3px -2px rgba(0, 0, 0, 0.2),
+ 0px 3px 4px 0px rgba(0, 0, 0, 0.14),
+ 0px 1px 8px 0px rgba(0, 0, 0, 0.12);
+ z-index: 1001;
}
.cdk-overlay-pane {
z-index: 1005;
}
-mat-select-panel{
+mat-select-panel {
z-index: 1005;
}
-.admin-functions, .changeClass {
+.admin-functions,
+.changeClass {
margin-bottom: -15px;
margin-left: 30px;
margin-right: 5px;
margin-top: -10px;
color: #4793d1;
-
::ng-deep .mat-form-field-wrapper {
padding-bottom: 20px !important;
}
@@ -86,7 +89,7 @@ mat-select-panel{
.advanced-features {
z-index: 2000 !important;
- display:flex;
+ display: flex;
flex-direction: row;
padding-left: 10px;
}
@@ -95,38 +98,32 @@ mat-select-panel{
}
.form-content-container {
- // position: fixed;
- // top: 121px;
- // right: 0;
- // bottom: 0;
- // left: 0;
- overflow: hidden;
- padding-top: 121px;
+ overflow: hidden;
}
.actions-container {
- max-width: 1128px;
- width: 100%;
- background-color: white;
- padding: 10px;
- display: flex;
+ max-width: 1128px;
+ width: 100%;
+ background-color: white;
+ padding: 10px;
+ display: flex;
}
.mat-accordion {
- width: 100%;
- max-width: 1020px;
- box-sizing: border-box;
+ width: 100%;
+ max-width: 1020px;
+ box-sizing: border-box;
}
.hidden {
- display: none !important;
+ display: none !important;
}
.validation-body {
- max-width:95%;
- display:flex;
- max-width: 960px;
-word-break: break-word;
+ max-width: 95%;
+ display: flex;
+ max-width: 960px;
+ word-break: break-word;
}
.validation-dismiss {
@@ -163,13 +160,12 @@ word-break: break-word;
display: flex;
padding: 5px 0;
-
.message-type {
text-transform: uppercase;
font-weight: 500;
margin-right: 20px;
- padding:10px;
- border-radius:3px;
+ padding: 10px;
+ border-radius: 3px;
height: 40px;
min-width: 95px;
}
@@ -182,19 +178,16 @@ word-break: break-word;
.warning-message {
color: #8a6d3b;
background-color: #fcf8e3;
-
}
-
.error-message {
color: #a94442;
background-color: #f2dede;
}
-
}
-.validate-button{
- margin-left:15px;
+.validate-button {
+ margin-left: 15px;
}
.mat-expansion-panel-header-title {
@@ -239,39 +232,38 @@ word-break: break-word;
}
.fontsize20px {
-font-size: 20px;
+ font-size: 20px;
}
.padtop90px {
-padding-top: 90px;
}
.padleft25px {
-padding-left: 25px;
+ padding-left: 25px;
}
.bordergray {
-border: 1px solid green;
+ border: 1px solid green;
}
.borderblue {
-border: 1px solid #007CBA;
+ border: 1px solid #007cba;
}
.fontbold {
-font-weight: bold;
+ font-weight: bold;
}
/* FDA COLOR BLUE CODE Hex: #007CBA */
.colorbluefda {
-color: #007CBA;
+ color: #007cba;
}
-::ng-deep .custom-menu{
-margin-top: -12px;
-/*z-index: 4000;*/
+::ng-deep .custom-menu {
+ margin-top: -12px;
+ /*z-index: 4000;*/
}
.mat-menu-item {
-color: #007CBA !important;
+ color: #007cba !important;
}
diff --git a/src/app/core/substance-ssg2/substance-ssg2-form.component.ts b/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
index ddb7da86c..a37e798f8 100644
--- a/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
+++ b/src/app/core/substance-ssg2/substance-ssg2-form.component.ts
@@ -40,8 +40,8 @@ import { SubstanceSsg2FormService } from './substance-ssg2-form.service';
import jp from 'jsonpath';
@Component({
- selector: 'app-substance-ssg2-form',
- templateUrl: './substance-ssg2-form.component.html',
+ selector: 'app-substance-ssg2-form',
+ templateUrl: './substance-ssg2-form.component.html',
styleUrls: ['./substance-ssg2-form.component.scss'],
standalone: false
})
@@ -276,6 +276,7 @@ export class SubstanceSsg2FormComponent implements OnInit, AfterViewInit, OnDest
if (this.configService.configData && this.configService.configData.autoSaveWait) {
this.autoSaveWait = this.configService.configData.autoSaveWait;
}
+
this.overlayContainer = this.overlayContainerService.getContainerElement();
this.imported = false;
const routeSubscription = this.activatedRoute
@@ -998,29 +999,29 @@ export class SubstanceSsg2FormComponent implements OnInit, AfterViewInit, OnDest
delete old['changeReason'];
- const refSet = {};
+ const refSet = {};
const refHolders2 = jp.query(old, '$..[?(@.references)]');
- for (let i = 0; i < refHolders2.length; i++) {
- const refs = refHolders2[i].references;
- for (let j = 0; j < refs.length; j++) {
- const or = refs[j];
- if (typeof or === 'object') { continue; }
- refSet[or] = true;
+ for (let i = 0; i < refHolders2.length; i++) {
+ const refs = refHolders2[i].references;
+ for (let j = 0; j < refs.length; j++) {
+ const or = refs[j];
+ if (typeof or === 'object') { continue; }
+ refSet[or] = true;
+ }
}
- }
- const nrefs = _.chain(old.references)
- .filter(function (ref) {
- if (refSet[ref.uuid]) {
- return true;
- } else {
- return false;
- }
- })
- .value();
+ const nrefs = _.chain(old.references)
+ .filter(function (ref) {
+ if (refSet[ref.uuid]) {
+ return true;
+ } else {
+ return false;
+ }
+ })
+ .value();
- old.references = nrefs;
+ old.references = nrefs;
return old;
}
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
index 29f5c7c22..c6008f307 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.html
@@ -1,5 +1,8 @@
-
- {{ privateSearchType | titlecase }} Search is Processing...
>
+
+
diff --git a/src/app/fda/advanced-search/advanced-search.component.scss b/src/app/fda/advanced-search/advanced-search.component.scss
index 035ef6e9b..5b342a3cb 100644
--- a/src/app/fda/advanced-search/advanced-search.component.scss
+++ b/src/app/fda/advanced-search/advanced-search.component.scss
@@ -4,6 +4,8 @@
margin: auto;
/*height: 200px; */
/*margin: 0 auto;*/
+
+ margin-bottom: 400px; /* ncats branch begin/end */
}
.div-flex {
@@ -54,20 +56,20 @@
height: 30px;
.condition-column {
- width: 100px;
+ width: 100px;
}
.queryable-property-column {
- width: 400px;
+ width: 400px;
}
.command-column {
- width: 190px
+ width: 190px;
}
.query-column {
- flex-grow: 1;
- padding-left: 10px;
+ flex-grow: 1;
+ padding-left: 10px;
}
}
@@ -86,7 +88,7 @@
.query-value {
padding: 10px 15px;
- background-color: var(--query-bg-color);
+ background-color: var(--query-bg-color);
border: solid 1px var(--query-border-color);
border-radius: 2px;
min-height: 40px;
@@ -97,7 +99,7 @@
display: flex;
.button-container {
- width: 35px;
+ width: 35px;
}
}
@@ -145,7 +147,7 @@
}
.colormaroon {
- color: rgb(151, 87, 87)
+ color: rgb(151, 87, 87);
}
.colororange {
@@ -192,9 +194,9 @@
margin-top: 30px;
}
-.margintop50px {
- margin-top: 50px;
-}
+// .margintop50px {
+// margin-top: 50px;
+// }
.margintop70px {
margin-top: 70px;
@@ -349,11 +351,10 @@
}
/* label style */
-.mat-tab-label{
+.mat-tab-label {
background: var(--pale-border-color-rgb-3);
- color: var(--red-label-color);
- min-width: 60px!important;
-
+ color: var(--red-label-color);
+ min-width: 60px !important;
}
:host ::ng-deep .mat-tab-label-active {
@@ -367,75 +368,77 @@
height: 2px;
}
-@media(max-width: 1175px) {
+@media (max-width: 1175px) {
.structure-editor-actions-container {
- flex-direction: column;
- width: 100%;
+ flex-direction: column;
+ width: 100%;
}
.editor-container {
- width: 100%;
- height: 390px;
+ width: 100%;
+ height: 390px;
}
.search-actions {
- flex-direction: row;
- border-left: none;
- padding-top: 10px;
- padding-left: 0;
- margin-left: 0;
-
- .one {
- order: 1;
- }
+ flex-direction: row;
+ border-left: none;
+ padding-top: 10px;
+ padding-left: 0;
+ margin-left: 0;
- .export-button {
- margin-left: 7px;
- }
+ .one {
+ order: 1;
+ }
- .two {
- order: 2;
- margin-left: auto;
- display: flex;
- padding-right: 10px;
+ .export-button {
+ margin-left: 7px;
+ }
- .similarity-cutoff {
- margin: 0;
- margin-top: 1px;
- }
- }
+ .two {
+ order: 2;
+ margin-left: auto;
+ display: flex;
+ padding-right: 10px;
- .three {
- order: 3;
+ .similarity-cutoff {
+ margin: 0;
+ margin-top: 1px;
}
+ }
+
+ .three {
+ order: 3;
+ }
}
.action-button-container {
- width: auto;
- margin-top: 0;
- align-self: flex-start;
+ width: auto;
+ margin-top: 0;
+ align-self: flex-start;
- button {
- width: auto;
- border: 1px solid var(--regular-green-color);
- }
+ button {
+ width: auto;
+ border: 1px solid var(--regular-green-color);
+ }
}
}
-@media(max-width: 970px) {
+@media (max-width: 970px) {
.structure-editor-actions-container {
- width: 100%;
- overflow-x: auto;
+ width: 100%;
+ overflow-x: auto;
}
- .editor-container, .search-actions {
- min-width: 633px;
+ .editor-container,
+ .search-actions {
+ min-width: 633px;
}
.jsdraw {
- .editor-container, .search-actions {
- min-width: 710px;
- }
+ .editor-container,
+ .search-actions {
+ min-width: 710px;
+ }
}
}
@@ -471,7 +474,7 @@
margin-right: 22px;
}
-::ng-deep .col:nth-child(3n+1) {
+::ng-deep .col:nth-child(3n + 1) {
clear: left;
}
@@ -571,7 +574,7 @@ panel-style {
}
}
-@media(max-width: 1175px) {
+@media (max-width: 1175px) {
.structure-editor-actions-container {
flex-direction: column;
width: 100%;
@@ -600,18 +603,20 @@ panel-style {
}
}
-@media(max-width: 970px) {
+@media (max-width: 970px) {
.structure-editor-actions-container {
width: 100%;
overflow-x: auto;
}
- .editor-container, .search-actions {
+ .editor-container,
+ .search-actions {
min-width: 633px;
}
.jsdraw {
- .editor-container, .search-actions {
+ .editor-container,
+ .search-actions {
min-width: 710px;
}
}
diff --git a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
index e06717474..ddd875b28 100644
--- a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
+++ b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
@@ -1,4 +1,3 @@
-
+
+
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
index b369adaad..d90dca9ef 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.scss
@@ -1,21 +1,20 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- /*top: 64px; */
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
/*justify-content: center;*/
- box-shadow: 0px 3px 3px -2px var(--box-shadow-color), 0px 3px 4px 0px var(--box-shadow-color-2), 0px 1px 8px 0px var(--box-shadow-color-3);
+ box-shadow:
+ 0px 3px 3px -2px var(--box-shadow-color),
+ 0px 3px 4px 0px var(--box-shadow-color-2),
+ 0px 1px 8px 0px var(--box-shadow-color-3);
z-index: 1001;
justify-content: flex-end;
}
-.top-fixed-top {
- top: 64px;
-}
-
.zindex2000 {
z-index: 2000;
}
@@ -51,7 +50,7 @@
}
.form-header-title-top {
- padding-top: 150px;
+ padding-top: 30px;
}
.form-header-no-title-top {
@@ -85,7 +84,6 @@ mat-select-panel {
margin-top: -10px;
color: var(--primary-color);
-
::ng-deep .mat-form-field-wrapper {
padding-bottom: 20px !important;
}
@@ -164,14 +162,12 @@ mat-select-panel {
.warning-message {
color: var(--warning-dialog-color);
background-color: var(--warning-dialog-bg-color);
-
}
.error-message {
color: var(--error-dialog-color);
background-color: var(--error-dialog-bg-color);
}
-
}
.validate-button {
@@ -246,7 +242,7 @@ mat-select-panel {
}
.borderblue {
- border: 1px solid #007CBA;
+ border: 1px solid #007cba;
}
.fontbold {
@@ -255,7 +251,7 @@ mat-select-panel {
/* FDA COLOR BLUE CODE Hex: #007CBA */
.colorbluefda {
- color: #007CBA;
+ color: #007cba;
}
.colorred {
@@ -272,7 +268,7 @@ mat-select-panel {
}
.mat-menu-item {
- color: #007CBA !important;
+ color: #007cba !important;
}
/*
@@ -287,7 +283,7 @@ button.mat-menu-item:hover {
*/
/* tyler added as quick fix */
-app-substance-form-ssg4m-process-card button[color=primary] {
+app-substance-form-ssg4m-process-card button[color="primary"] {
float: right;
}
@@ -298,4 +294,4 @@ app-substance-form-ssg4m-process-card button[color=primary] {
.main-container {
position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
index 1033c0c47..42d6aef5c 100644
--- a/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
+++ b/src/app/core/substance-ssg4m/substance-ssg4m-form.component.ts
@@ -130,6 +130,7 @@ export class SubstanceSsg4ManufactureFormComponent
configSettingReferences = false;
private submitSubscription: any = null;
ssg4mExportSvg: boolean;
+
private jsLibScriptUrls = [
`${environment.baseHref || ""}assets/pathway/cola.min.js`,
@@ -174,6 +175,8 @@ export class SubstanceSsg4ManufactureFormComponent
this.showRegisterEditTitle = this.configSsg4Form.showRegisterEditTitle;
}
+
+
this.substanceClass = "specifiedSubstanceG4m";
const routeSubscription = this.activatedRoute.params.subscribe((params) => {
diff --git a/src/app/core/substance-text-search/substance-text-search.component.scss b/src/app/core/substance-text-search/substance-text-search.component.scss
index 529457eb9..3bb72cdfc 100644
--- a/src/app/core/substance-text-search/substance-text-search.component.scss
+++ b/src/app/core/substance-text-search/substance-text-search.component.scss
@@ -207,7 +207,7 @@ form:not(.header) {
right: 0;
width: 100%;
left: 0;
- height: 64px;
+ height: 92px; /* ncats branch begin/end not sure about this */
padding-right: 210px;
padding-left: 16px;
background-color: var(--primary-color);
diff --git a/src/app/core/substances-browse/substances-browse.component.html b/src/app/core/substances-browse/substances-browse.component.html
index d0666a810..039931c33 100644
--- a/src/app/core/substances-browse/substances-browse.component.html
+++ b/src/app/core/substances-browse/substances-browse.component.html
@@ -1413,3 +1413,5 @@
+
+
+
+
+
@@ -81,8 +84,10 @@
+
-
-
\ No newline at end of file
+
@@ -125,4 +130,4 @@
{{ privateSearchType | titlecase }} Search is Processing...
>
+
+
diff --git a/src/app/fda/advanced-search/advanced-search.component.scss b/src/app/fda/advanced-search/advanced-search.component.scss
index 035ef6e9b..5b342a3cb 100644
--- a/src/app/fda/advanced-search/advanced-search.component.scss
+++ b/src/app/fda/advanced-search/advanced-search.component.scss
@@ -4,6 +4,8 @@
margin: auto;
/*height: 200px; */
/*margin: 0 auto;*/
+
+ margin-bottom: 400px; /* ncats branch begin/end */
}
.div-flex {
@@ -54,20 +56,20 @@
height: 30px;
.condition-column {
- width: 100px;
+ width: 100px;
}
.queryable-property-column {
- width: 400px;
+ width: 400px;
}
.command-column {
- width: 190px
+ width: 190px;
}
.query-column {
- flex-grow: 1;
- padding-left: 10px;
+ flex-grow: 1;
+ padding-left: 10px;
}
}
@@ -86,7 +88,7 @@
.query-value {
padding: 10px 15px;
- background-color: var(--query-bg-color);
+ background-color: var(--query-bg-color);
border: solid 1px var(--query-border-color);
border-radius: 2px;
min-height: 40px;
@@ -97,7 +99,7 @@
display: flex;
.button-container {
- width: 35px;
+ width: 35px;
}
}
@@ -145,7 +147,7 @@
}
.colormaroon {
- color: rgb(151, 87, 87)
+ color: rgb(151, 87, 87);
}
.colororange {
@@ -192,9 +194,9 @@
margin-top: 30px;
}
-.margintop50px {
- margin-top: 50px;
-}
+// .margintop50px {
+// margin-top: 50px;
+// }
.margintop70px {
margin-top: 70px;
@@ -349,11 +351,10 @@
}
/* label style */
-.mat-tab-label{
+.mat-tab-label {
background: var(--pale-border-color-rgb-3);
- color: var(--red-label-color);
- min-width: 60px!important;
-
+ color: var(--red-label-color);
+ min-width: 60px !important;
}
:host ::ng-deep .mat-tab-label-active {
@@ -367,75 +368,77 @@
height: 2px;
}
-@media(max-width: 1175px) {
+@media (max-width: 1175px) {
.structure-editor-actions-container {
- flex-direction: column;
- width: 100%;
+ flex-direction: column;
+ width: 100%;
}
.editor-container {
- width: 100%;
- height: 390px;
+ width: 100%;
+ height: 390px;
}
.search-actions {
- flex-direction: row;
- border-left: none;
- padding-top: 10px;
- padding-left: 0;
- margin-left: 0;
-
- .one {
- order: 1;
- }
+ flex-direction: row;
+ border-left: none;
+ padding-top: 10px;
+ padding-left: 0;
+ margin-left: 0;
- .export-button {
- margin-left: 7px;
- }
+ .one {
+ order: 1;
+ }
- .two {
- order: 2;
- margin-left: auto;
- display: flex;
- padding-right: 10px;
+ .export-button {
+ margin-left: 7px;
+ }
- .similarity-cutoff {
- margin: 0;
- margin-top: 1px;
- }
- }
+ .two {
+ order: 2;
+ margin-left: auto;
+ display: flex;
+ padding-right: 10px;
- .three {
- order: 3;
+ .similarity-cutoff {
+ margin: 0;
+ margin-top: 1px;
}
+ }
+
+ .three {
+ order: 3;
+ }
}
.action-button-container {
- width: auto;
- margin-top: 0;
- align-self: flex-start;
+ width: auto;
+ margin-top: 0;
+ align-self: flex-start;
- button {
- width: auto;
- border: 1px solid var(--regular-green-color);
- }
+ button {
+ width: auto;
+ border: 1px solid var(--regular-green-color);
+ }
}
}
-@media(max-width: 970px) {
+@media (max-width: 970px) {
.structure-editor-actions-container {
- width: 100%;
- overflow-x: auto;
+ width: 100%;
+ overflow-x: auto;
}
- .editor-container, .search-actions {
- min-width: 633px;
+ .editor-container,
+ .search-actions {
+ min-width: 633px;
}
.jsdraw {
- .editor-container, .search-actions {
- min-width: 710px;
- }
+ .editor-container,
+ .search-actions {
+ min-width: 710px;
+ }
}
}
@@ -471,7 +474,7 @@
margin-right: 22px;
}
-::ng-deep .col:nth-child(3n+1) {
+::ng-deep .col:nth-child(3n + 1) {
clear: left;
}
@@ -571,7 +574,7 @@ panel-style {
}
}
-@media(max-width: 1175px) {
+@media (max-width: 1175px) {
.structure-editor-actions-container {
flex-direction: column;
width: 100%;
@@ -600,18 +603,20 @@ panel-style {
}
}
-@media(max-width: 970px) {
+@media (max-width: 970px) {
.structure-editor-actions-container {
width: 100%;
overflow-x: auto;
}
- .editor-container, .search-actions {
+ .editor-container,
+ .search-actions {
min-width: 633px;
}
.jsdraw {
- .editor-container, .search-actions {
+ .editor-container,
+ .search-actions {
min-width: 710px;
}
}
diff --git a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
index e06717474..ddd875b28 100644
--- a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
+++ b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.html
@@ -1,4 +1,3 @@
-
diff --git a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
index 3ba1dcd72..580e017af 100644
--- a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
+++ b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
@@ -1,3 +1,8 @@
+:host {
+ display: block;
+ padding-top: 20px;
+}
+
:host ::ng-deep .mat-mdc-tab-list .mat-mdc-tab,
:host ::ng-deep .mat-tab-list .mat-tab-label {
flex-grow: 0 !important;
diff --git a/src/app/fda/adverse-event/adverse-events-cvm-browse/adverse-events-cvm-browse.component.scss b/src/app/fda/adverse-event/adverse-events-cvm-browse/adverse-events-cvm-browse.component.scss
index 6ca1f7b10..a21c04f64 100644
--- a/src/app/fda/adverse-event/adverse-events-cvm-browse/adverse-events-cvm-browse.component.scss
+++ b/src/app/fda/adverse-event/adverse-events-cvm-browse/adverse-events-cvm-browse.component.scss
@@ -1165,6 +1165,8 @@ margin:auto;
.sidenav-container-size {
width: 100%;
+ position: relative;
+ margin-top: 0;
}
.top-search {
diff --git a/src/app/fda/adverse-event/adverse-events-dme-browse/adverse-events-dme-browse.component.scss b/src/app/fda/adverse-event/adverse-events-dme-browse/adverse-events-dme-browse.component.scss
index a8eab6cfc..8c535a792 100644
--- a/src/app/fda/adverse-event/adverse-events-dme-browse/adverse-events-dme-browse.component.scss
+++ b/src/app/fda/adverse-event/adverse-events-dme-browse/adverse-events-dme-browse.component.scss
@@ -1165,6 +1165,8 @@ margin:auto;
.sidenav-container-size {
width: 100%;
+ position: relative;
+ margin-top: 0;
}
.top-search {
diff --git a/src/app/fda/adverse-event/adverse-events-pt-browse/adverse-events-pt-browse.component.scss b/src/app/fda/adverse-event/adverse-events-pt-browse/adverse-events-pt-browse.component.scss
index cf84f6746..b5314a885 100644
--- a/src/app/fda/adverse-event/adverse-events-pt-browse/adverse-events-pt-browse.component.scss
+++ b/src/app/fda/adverse-event/adverse-events-pt-browse/adverse-events-pt-browse.component.scss
@@ -1160,6 +1160,8 @@ margin:auto;
.sidenav-container-size {
width: 100%;
+ position: relative;
+ margin-top: 0;
}
.top-search {
diff --git a/src/app/fda/application/application-form/application-form.component.scss b/src/app/fda/application/application-form/application-form.component.scss
index dfd85106d..05f79263a 100644
--- a/src/app/fda/application/application-form/application-form.component.scss
+++ b/src/app/fda/application/application-form/application-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,9 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/application/applications-browse/applications-browse.component.scss b/src/app/fda/application/applications-browse/applications-browse.component.scss
index 93df32dc4..b80a83571 100644
--- a/src/app/fda/application/applications-browse/applications-browse.component.scss
+++ b/src/app/fda/application/applications-browse/applications-browse.component.scss
@@ -264,6 +264,12 @@
min-width: 660px;
}
+@media(max-width: 1099px) {
+ .expand-sidenav {
+ display: none;
+ }
+}
+
@media(max-width: 1615px) {
.full-paginator {
width: 100%;
diff --git a/src/app/fda/config/config.json b/src/app/fda/config/config.json
index c5afe7475..e5cbe4804 100644
--- a/src/app/fda/config/config.json
+++ b/src/app/fda/config/config.json
@@ -1,5 +1,19 @@
{
- "version": "3.2.0-SNAPSHOT",
+ "deprecated_customToolbarComponent": "precisionFDA",
+ "_isPfdaVersion": true,
+ "apiBaseUrl": "http://localhost:8081/ginas/app/",
+ "gsrsHomeBaseUrl": "http://localhost:8081/ginas/app/",
+ "apiSSG4mBaseUrl": "http://localhost:8081/ginas/app/",
+
+ "_apiBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+ "_gsrsHomeBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/ui/",
+ "_apiSSG4mBaseUrl": "https://gsrs-dev-public.ncats.io/ginas/app/",
+
+ "showFooter": true,
+ "occasionalApiBasePath": "/ginas/app",
+ "version": "3.2.0-SNAPSHOT-ncats-branch",
+ "phpIdUrl": "https://phpidpublish.who-umc.org/search?phpid=",
+ "rxNormUrl": "https://dailymed.nlm.nih.gov/dailymed/search.cfm?searchdb=rxcui&query=",
"contactEmail": "GSRSSupport@fda.hhs.gov",
"displayMatchApplication": "true",
"adverseEventShinyHomepageDisplay": "false",
@@ -18,12 +32,8 @@
"showCrossEntitySearchDropdown": true,
"polymerDisclaimer": "Please do not consider GSRS to be an expert system when registering polymer substances.",
"disableJSDraw": false,
- "registerApplicationCenterNotAllowed": ["CDER", "CBER"],
- "apiBaseUrl": "http://localhost:8081/ginas/app/",
- "gsrsHomeBaseUrl": "http://localhost:8081/ginas/app/ui/",
- "apiSSG4mBaseUrl": "http://localhost:8081/ginas/app/",
- "occasionalApiBasePath": "/ginas/app",
"restApiPrefix": "/ginas/app",
+ "showTopBanner": true,
"authenticateAs": {
"apiUsername": null,
"apiPassword": null,
@@ -33,6 +43,7 @@
"stagingArea": {
"mergeAction": false
},
+
"userRegistration": {
"configurations": {
"emailForm": {
@@ -78,13 +89,7 @@
]
},
"filteredDuplicationCodes": ["BDNUM", "FDA UNII"],
- "typeaheadFields": [
- "Standardized_Name",
- "Display_Name",
- "CAS",
- "Name",
- "Approval_ID"
- ],
+ "typeaheadFields": ["Standardized_Name", "Display_Name", "CAS", "Name", "Approval_ID"],
"loadedComponents": {
"applications": true,
"products": true,
@@ -912,7 +917,7 @@
"DASH INDICATION",
"DEA NO.",
"DME Reactions",
- "DRUGBANK",
+ "DRUG BANK",
"DRUG CENTRAL",
"DSLD",
"EC (ENZYME CLASS)",
diff --git a/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
index c54ef7c45..4625a7faf 100644
--- a/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -13,7 +13,9 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+
+ margin-bottom: 200px; /* ncats branch begin/end */
+
}
.height30px {
diff --git a/src/app/fda/impurities/impurities-form/impurities-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-form.component.scss
index e0712efd0..e386b52dd 100644
--- a/src/app/fda/impurities/impurities-form/impurities-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,8 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+ // margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
index 4bea50819..0b8aaf4c5 100644
--- a/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -13,7 +13,8 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
+
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss b/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
index 43c984437..3056d96d1 100644
--- a/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,7 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
index 52c9d1d7b..74d8999db 100644
--- a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -13,7 +13,7 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
index 361d2e26a..178c0bf26 100644
--- a/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,6 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
index c7c65a4cd..581718e51 100644
--- a/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -20,7 +20,6 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
index 30d160088..7cdcce892 100644
--- a/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,7 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.height30px {
diff --git a/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
index 4ae9a74b8..dc6b7123c 100644
--- a/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -13,7 +13,7 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss b/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
index 6dbd3ec98..22c030b00 100644
--- a/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
+++ b/src/app/fda/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,7 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
index d631376ae..56663db71 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-assay-data-import/invitro-pharmacology-assay-data-import.component.scss
@@ -1,21 +1,25 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
justify-content: center;
- box-shadow: 0px 3px 3px -2px var(--box-shadow-color), 0px 3px 4px 0px var(--box-shadow-color-2), 0px 1px 8px 0px var(--box-shadow-color-3);
+ box-shadow:
+ 0px 3px 3px -2px var(--box-shadow-color),
+ 0px 3px 4px 0px var(--box-shadow-color-2),
+ 0px 1px 8px 0px var(--box-shadow-color-3);
z-index: 1001;
}
.form-content-container {
overflow-x: auto;
overflow-y: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
padding-right: 70px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
@@ -34,10 +38,10 @@
}
.title {
- font-size: 24px;
- font-weight: 600px;
- font-family: Arial, Helvetica, sans-serif;
- /*padding-left: 70px; */
+ font-size: 24px;
+ font-weight: 600px;
+ font-family: Arial, Helvetica, sans-serif;
+ /*padding-left: 70px; */
}
.titleblue {
@@ -65,11 +69,11 @@
.headerstyle {
border-radius: 7px 7px 0px 0px;
border: 1px solid var(--blue-color);
- background-color: var(--table-th-border-color); /*--primary-title-color*/
+ background-color: var(--table-th-border-color); /*--primary-title-color*/
border-bottom: none;
padding-left: 10px;
height: 50px;
- color: #FFFFFF;
+ color: #ffffff;
}
.row {
@@ -132,7 +136,7 @@
}
.col-6-4 {
- width: calc((100% - 20px) / (6/4));
+ width: calc((100% - 20px) / (6 / 4));
margin-right: 20px;
}
@@ -141,7 +145,7 @@
}
.col-6-5 {
- width: calc((100% - 10px) / (6/5));
+ width: calc((100% - 10px) / (6 / 5));
margin-right: 10px;
}
@@ -150,7 +154,7 @@
}
.col-5-more {
- width: calc((100% + 100px) / (6/5));
+ width: calc((100% + 100px) / (6 / 5));
margin-right: 10px;
}
@@ -227,8 +231,8 @@
text-transform: uppercase;
font-weight: 500;
margin-right: 20px;
- padding:10px;
- border-radius:3px;
+ padding: 10px;
+ border-radius: 3px;
}
}
@@ -239,14 +243,12 @@
.warning-message {
color: var(--warning-dialog-color);
background-color: var(--warning-dialog-bg-color);
-
}
.error-message {
color: var(--error-dialog-color);
background-color: var(--error-dialog-bg-color);
}
-
}
.divflexrow {
@@ -388,7 +390,7 @@
.colorblue {
/* BLUE CODE Hex: #007CBA */
- color: #007CBA;
+ color: #007cba;
}
.font11px {
@@ -468,7 +470,6 @@ hr {
}
.mat-form-field-style {
-
/* OVERWRITE MATERIAL INPUT FIELDS */
.mat-form-field-infix {
color: var(--regular-blue-color);
@@ -493,12 +494,16 @@ hr {
/*Focused: change color of underline*/
.mat-form-field-ripple {
- background-color: var(--mat-form-field-focused-color) !important;;
+ background-color: var(--mat-form-field-focused-color) !important;
}
- .mat-form-field-disabled .mat-form-field-underline
- {
- background-image: linear-gradient( to right, var(--img-linear-gradient-start-color) 0, var(--textarea-dark-border-color) 10%, var(--img-linear-gradient-color) 0 ) !important;
+ .mat-form-field-disabled .mat-form-field-underline {
+ background-image: linear-gradient(
+ to right,
+ var(--img-linear-gradient-start-color) 0,
+ var(--textarea-dark-border-color) 10%,
+ var(--img-linear-gradient-color) 0
+ ) !important;
background-size: 1px 100% !important;
background-repeat: repeat-x !important;
cursor: not-allowed;
@@ -513,13 +518,11 @@ hr {
}
}
-.mat-expansion-indicator
-{
- pointer-events: visiblefill !important;
+.mat-expansion-indicator {
+ pointer-events: visiblefill !important;
}
.panel-style {
-
.mat-panel-title {
width: 300px;
min-width: 300px;
@@ -553,7 +556,8 @@ table.tableStyle {
padding-right: 60px;
}
-table.tableStyle td, table.tableStyle th {
+table.tableStyle td,
+table.tableStyle th {
border: 1px solid var(--table-th-border-color);
padding: 5px 5px;
}
@@ -601,11 +605,11 @@ table.tableStyle tfoot .links {
text-align: right;
}
-table.tableStyle tfoot .links a{
+table.tableStyle tfoot .links a {
display: inline-block;
background: var(--secondary-blue-color);
color: var(--white-color);
padding: 2px 8px;
border-radius: 5px;
}
-/* Table Style End */
\ No newline at end of file
+/* Table Style End */
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
index 9cdc19432..5f881110d 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assay-form/invitro-pharmacology-assay-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,8 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
index c0afbf529..8332db9aa 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-assayset-form/invitro-pharmacology-assayset-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -16,7 +16,8 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
index 8f397d388..a961ab75d 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-form.component.scss
@@ -1,13 +1,16 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
justify-content: center;
- box-shadow: 0px 3px 3px -2px var(--box-shadow-color), 0px 3px 4px 0px var(--box-shadow-color-2), 0px 1px 8px 0px var(--box-shadow-color-3);
+ box-shadow:
+ 0px 3px 3px -2px var(--box-shadow-color),
+ 0px 3px 4px 0px var(--box-shadow-color-2),
+ 0px 1px 8px 0px var(--box-shadow-color-3);
z-index: 1001;
}
@@ -15,7 +18,7 @@
width: 1140px;
margin: 0 auto;
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
}
.scrollable-container {
@@ -85,7 +88,9 @@
.divshadow {
width: 100%;
- box-shadow: 0 0px 6px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ box-shadow:
+ 0 0px 6px 0 rgba(0, 0, 0, 0.2),
+ 0 6px 20px 0 rgba(0, 0, 0, 0.19);
text-align: center;
}
@@ -97,7 +102,7 @@
border-bottom: none;
padding-left: 10px;
height: 50px;
- color: #FFFFFF;
+ color: #ffffff;
}
.fieldKey {
@@ -161,7 +166,7 @@
}
.col-6-4 {
- width: calc((100% - 20px) / (6/4));
+ width: calc((100% - 20px) / (6 / 4));
margin-right: 20px;
}
@@ -170,7 +175,7 @@
}
.col-6-5 {
- width: calc((100% - 10px) / (6/5));
+ width: calc((100% - 10px) / (6 / 5));
margin-right: 10px;
}
@@ -179,7 +184,7 @@
}
.col-5-more {
- width: calc((100% + 100px) / (6/5));
+ width: calc((100% + 100px) / (6 / 5));
margin-right: 10px;
}
@@ -623,7 +628,7 @@
}
.fontverdana {
- font-family: Verdana, Geneva, Tahoma, sans-serif
+ font-family: Verdana, Geneva, Tahoma, sans-serif;
}
.textalignright {
@@ -687,7 +692,6 @@ hr {
}
.mat-form-field-style {
-
/* OVERWRITE MATERIAL INPUT FIELDS */
.mat-form-field-infix {
color: var(--regular-blue-color);
@@ -713,11 +717,15 @@ hr {
/*Focused: change color of underline*/
.mat-form-field-ripple {
background-color: var(--mat-form-field-focused-color) !important;
- ;
}
.mat-form-field-disabled .mat-form-field-underline {
- background-image: linear-gradient(to right, var(--img-linear-gradient-start-color) 0, var(--textarea-dark-border-color) 10%, var(--img-linear-gradient-color) 0) !important;
+ background-image: linear-gradient(
+ to right,
+ var(--img-linear-gradient-start-color) 0,
+ var(--textarea-dark-border-color) 10%,
+ var(--img-linear-gradient-color) 0
+ ) !important;
background-size: 1px 100% !important;
background-repeat: repeat-x !important;
cursor: not-allowed;
@@ -741,7 +749,6 @@ hr {
}
.panel-style {
-
.mat-panel-title {
width: 300px;
min-width: 300px;
@@ -851,14 +858,12 @@ legend.border {
.warning-message {
color: var(--warning-dialog-color);
background-color: var(--warning-dialog-bg-color);
-
}
.error-message {
color: var(--error-dialog-color);
background-color: var(--error-dialog-bg-color);
}
-
}
/* Table Style Begin */
@@ -933,4 +938,4 @@ table.tableStyle tfoot .links a {
border-radius: 5px;
}
-/* Table Style End */
\ No newline at end of file
+/* Table Style End */
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
index 2d5b70503..870a94e6f 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -18,7 +18,7 @@
width: 1160px;
margin: 0 auto;
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
}
.scrollable-container {
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
index c3b2de975..725d8684a 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology-screening-data-import/invitro-pharmacology-screening-data-import.component.scss
@@ -1,20 +1,24 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
justify-content: center;
- box-shadow: 0px 3px 3px -2px var(--box-shadow-color), 0px 3px 4px 0px var(--box-shadow-color-2), 0px 1px 8px 0px var(--box-shadow-color-3);
+ box-shadow:
+ 0px 3px 3px -2px var(--box-shadow-color),
+ 0px 3px 4px 0px var(--box-shadow-color-2),
+ 0px 1px 8px 0px var(--box-shadow-color-3);
z-index: 1001;
}
.form-content-container {
overflow-x: auto;
overflow-y: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
@@ -33,10 +37,10 @@
}
.title {
- font-size: 24px;
- font-weight: 600px;
- font-family: Arial, Helvetica, sans-serif;
- /*padding-left: 70px; */
+ font-size: 24px;
+ font-weight: 600px;
+ font-family: Arial, Helvetica, sans-serif;
+ /*padding-left: 70px; */
}
.titleblue {
@@ -68,11 +72,11 @@
.headerstyle {
border-radius: 7px 7px 0px 0px;
border: 1px solid var(--blue-color);
- background-color: var(--table-th-border-color); /*--primary-title-color*/
+ background-color: var(--table-th-border-color); /*--primary-title-color*/
border-bottom: none;
padding-left: 10px;
height: 50px;
- color: #FFFFFF;
+ color: #ffffff;
}
.headerstyle2 {
@@ -160,7 +164,7 @@
}
.col-6-4 {
- width: calc((100% - 20px) / (6/4));
+ width: calc((100% - 20px) / (6 / 4));
margin-right: 20px;
}
@@ -169,7 +173,7 @@
}
.col-6-5 {
- width: calc((100% - 10px) / (6/5));
+ width: calc((100% - 10px) / (6 / 5));
margin-right: 10px;
}
@@ -178,7 +182,7 @@
}
.col-5-more {
- width: calc((100% + 100px) / (6/5));
+ width: calc((100% + 100px) / (6 / 5));
margin-right: 10px;
}
@@ -255,8 +259,8 @@
text-transform: uppercase;
font-weight: 500;
margin-right: 20px;
- padding:10px;
- border-radius:3px;
+ padding: 10px;
+ border-radius: 3px;
}
}
@@ -267,14 +271,12 @@
.warning-message {
color: var(--warning-dialog-color);
background-color: var(--warning-dialog-bg-color);
-
}
.error-message {
color: var(--error-dialog-color);
background-color: var(--error-dialog-bg-color);
}
-
}
.divflexrow {
@@ -531,7 +533,6 @@ hr {
}
.mat-form-field-style {
-
/* OVERWRITE MATERIAL INPUT FIELDS */
.mat-form-field-infix {
color: var(--regular-blue-color);
@@ -556,12 +557,16 @@ hr {
/*Focused: change color of underline*/
.mat-form-field-ripple {
- background-color: var(--mat-form-field-focused-color) !important;;
+ background-color: var(--mat-form-field-focused-color) !important;
}
- .mat-form-field-disabled .mat-form-field-underline
- {
- background-image: linear-gradient( to right, var(--img-linear-gradient-start-color) 0, var(--textarea-dark-border-color) 10%, var(--img-linear-gradient-color) 0 ) !important;
+ .mat-form-field-disabled .mat-form-field-underline {
+ background-image: linear-gradient(
+ to right,
+ var(--img-linear-gradient-start-color) 0,
+ var(--textarea-dark-border-color) 10%,
+ var(--img-linear-gradient-color) 0
+ ) !important;
background-size: 1px 100% !important;
background-repeat: repeat-x !important;
cursor: not-allowed;
@@ -576,13 +581,11 @@ hr {
}
}
-.mat-expansion-indicator
-{
- pointer-events: visiblefill !important;
+.mat-expansion-indicator {
+ pointer-events: visiblefill !important;
}
.panel-style {
-
.mat-panel-title {
width: 300px;
min-width: 300px;
@@ -615,7 +618,8 @@ table.tableStyle {
padding-right: 60px;
}
-table.tableStyle td, table.tableStyle th {
+table.tableStyle td,
+table.tableStyle th {
border: 1px solid var(--table-th-border-color);
padding: 5px 5px;
}
@@ -663,11 +667,11 @@ table.tableStyle tfoot .links {
text-align: right;
}
-table.tableStyle tfoot .links a{
+table.tableStyle tfoot .links a {
display: inline-block;
background: var(--secondary-blue-color);
color: var(--white-color);
padding: 2px 8px;
border-radius: 5px;
}
-/* Table Style End */
\ No newline at end of file
+/* Table Style End */
diff --git a/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss b/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
index 796708e5e..7024c3114 100644
--- a/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
+++ b/src/app/fda/invitro-pharmacology/invitro-pharmacology.component.scss
@@ -1,8 +1,8 @@
.top-fixed {
- position: fixed;
+ position: sticky;
display: flex;
flex-direction: column;
- top: 64px;
+ top: 0;
width: 100%;
background-color: var(--regular-white-color);
align-items: center;
@@ -13,7 +13,8 @@
.form-content-container {
overflow: hidden;
- padding-top: 110px;
+ // padding-top: 110px;
+ margin-bottom: 200px; /* ncats branch begin/end */
}
.scrollable-container {
diff --git a/src/app/fda/jira-submit-ticket/jira-submit-ticket.component.scss b/src/app/fda/jira-submit-ticket/jira-submit-ticket.component.scss
index 9b75cd63e..1b6d06030 100644
--- a/src/app/fda/jira-submit-ticket/jira-submit-ticket.component.scss
+++ b/src/app/fda/jira-submit-ticket/jira-submit-ticket.component.scss
@@ -8,5 +8,4 @@
}
.padtop110px {
- padding-top: 110px;
}
diff --git a/src/app/fda/product/product-form/product-form.component.html b/src/app/fda/product/product-form/product-form.component.html
index 97f4ca242..d8a7bfba8 100644
--- a/src/app/fda/product/product-form/product-form.component.html
+++ b/src/app/fda/product/product-form/product-form.component.html
@@ -1,4 +1,6 @@
+
+
+