diff --git a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.html b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.html index 4ef86cdf..37726e54 100644 --- a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.html +++ b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.html @@ -1,4 +1,4 @@ -
+

All of the following components must be present:

@@ -15,7 +15,24 @@

All of the following components

-
+
+

All of the following Minor components + must be present:

+
+
+
{{component.substance.linkingID}}
+ + + +
+ + {{component.substance.name}} + +
+
+
+
+

Any of these components may be present:

diff --git a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.scss b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.scss index 2688351b..e21ea2b9 100644 --- a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.scss +++ b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.scss @@ -26,4 +26,8 @@ .close-container { width:100%; +} + +.type-row { + margin-bottom:50px; } \ No newline at end of file diff --git a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.ts b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.ts index e6ed10f9..da78b2fb 100644 --- a/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.ts +++ b/src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.ts @@ -13,6 +13,7 @@ import { MatDialog } from '@angular/material/dialog'; export class SubstanceMixtureComponentsComponent extends SubstanceCardBase implements OnInit { components: Array; required: Array; + requiredMinor: Array; presentInAny: Array; presentInOne: Array; substanceUpdated = new Subject(); @@ -32,6 +33,8 @@ export class SubstanceMixtureComponentsComponent extends SubstanceCardBase imple this.components = this.substance.mixture.components; this.required = this.components.filter( component => component.type === 'MUST_BE_PRESENT'); + this.requiredMinor = this.components.filter( + component => component.type === 'MUST_BE_PRESENT_MINOR'); this.presentInAny = this.components.filter( component => component.type === 'MAY_BE_PRESENT_ANY_OF'); this.presentInOne = this.components.filter(